mirror of
				https://github.com/KartKrewDev/RingRacers.git
				synced 2025-10-30 08:01:28 +00:00 
			
		
		
		
	Merge branch 'master' into new-spb
This commit is contained in:
		
						commit
						43fa2ec19f
					
				
					 1 changed files with 8 additions and 4 deletions
				
			
		
							
								
								
									
										12
									
								
								src/d_main.c
									
										
									
									
									
								
							
							
						
						
									
										12
									
								
								src/d_main.c
									
										
									
									
									
								
							|  | @ -1775,16 +1775,16 @@ void D_SRB2Main(void) | |||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	// Has to be done before anything else so skin, color, etc in command buffer has an affect.
 | ||||
| 	// ttlprofilen used because it's roughly equivalent in functionality - a QoL aid for quickly getting from startup to action
 | ||||
| 	PR_ApplyProfile(cv_ttlprofilen.value, 0); | ||||
| 
 | ||||
| 	if (autostart || netgame) | ||||
| 	{ | ||||
| 		gameaction = ga_nothing; | ||||
| 
 | ||||
| 		CV_ClearChangedFlags(); | ||||
| 
 | ||||
| 		// Has to be done before anything else so skin, color, etc in command buffer has an affect.
 | ||||
| 		// ttlprofilen used because it's roughly equivalent in functionality - a QoL aid for quickly getting from startup to action
 | ||||
| 		PR_ApplyProfile(cv_ttlprofilen.value, 0); | ||||
| 
 | ||||
| 		// Do this here so if you run SRB2 with eg +timelimit 5, the time limit counts
 | ||||
| 		// as having been modified for the first game.
 | ||||
| 		M_PushSpecialParameters(); // push all "+" parameter at the command buffer
 | ||||
|  | @ -1887,9 +1887,13 @@ void D_SRB2Main(void) | |||
| 	else if (M_CheckParm("-skipintro")) | ||||
| 	{ | ||||
| 		F_StartTitleScreen(); | ||||
| 		CV_StealthSetValue(&cv_currprofile, -1); | ||||
| 	} | ||||
| 	else | ||||
| 	{ | ||||
| 		F_StartIntro(); // Tails 03-03-2002
 | ||||
| 		CV_StealthSetValue(&cv_currprofile, -1); | ||||
| 	} | ||||
| 
 | ||||
| 	CON_ToggleOff(); | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Sally Coolatta
						Sally Coolatta