diff --git a/src/d_clisrv.c b/src/d_clisrv.c index a2ccd6c0..15ab7f88 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -5945,23 +5945,20 @@ boolean TryRunTics(tic_t realtics) if (ticking) { - if (advancedemo) - D_StartTitle(); - else - // run the count * tics - while (neededtic > gametic) - { - DEBFILE(va("============ Running tic %d (local %d)\n", gametic, localgametic)); + // run the count * tics + while (neededtic > gametic) + { + DEBFILE(va("============ Running tic %d (local %d)\n", gametic, localgametic)); - G_Ticker((gametic % NEWTICRATERATIO) == 0); - ExtraDataTicker(); - gametic++; - consistancy[gametic%TICQUEUE] = Consistancy(); + G_Ticker((gametic % NEWTICRATERATIO) == 0); + ExtraDataTicker(); + gametic++; + consistancy[gametic%TICQUEUE] = Consistancy(); - // Leave a certain amount of tics present in the net buffer as long as we've ran at least one tic this frame. - if (client && gamestate == GS_LEVEL && leveltime > 3 && neededtic <= gametic + cv_netticbuffer.value) - break; - } + // Leave a certain amount of tics present in the net buffer as long as we've ran at least one tic this frame. + if (client && gamestate == GS_LEVEL && leveltime > 3 && neededtic <= gametic + cv_netticbuffer.value) + break; + } } else { diff --git a/src/d_main.c b/src/d_main.c index a08ed77d..517b3b98 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -144,7 +144,6 @@ boolean sound_disabled = false; boolean digital_disabled = false; #endif -boolean advancedemo; #ifdef DEBUGFILE INT32 debugload = 0; #endif @@ -815,15 +814,6 @@ void D_SRB2Loop(void) } } -// -// D_AdvanceDemo -// Called after each demo or intro demosequence finishes -// -void D_AdvanceDemo(void) -{ - advancedemo = true; -} - // ========================================================================= // D_SRB2Main // ========================================================================= @@ -883,7 +873,6 @@ void D_StartTitle(void) //demosequence = -1; gametype = GT_RACE; // SRB2kart paused = false; - advancedemo = false; F_StartTitleScreen(); // Reset the palette -- SRB2Kart: actually never mind let's do this in the middle of every fade diff --git a/src/d_main.h b/src/d_main.h index d67a5bb4..af74e7a6 100644 --- a/src/d_main.h +++ b/src/d_main.h @@ -17,8 +17,6 @@ #include "d_event.h" #include "w_wad.h" // for MAX_WADFILES -extern boolean advancedemo; - // make sure not to write back the config until it's been correctly loaded extern tic_t rendergametic; @@ -34,7 +32,6 @@ void D_SRB2Loop(void) FUNCNORETURN; // D_SRB2Main() // Not a globally visible function, just included for source reference, // calls all startup code, parses command line options. -// If not overrided by user input, calls D_AdvanceDemo. // void D_SRB2Main(void); @@ -51,7 +48,6 @@ const char *D_Home(void); // // BASE LEVEL // -void D_AdvanceDemo(void); void D_StartTitle(void); #endif //__D_MAIN__ diff --git a/src/g_game.c b/src/g_game.c index 972d3c18..68dc393a 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -8358,7 +8358,7 @@ boolean G_CheckDemoStatus(void) CONS_Printf(M_GetText("timed %u gametics in %d realtics\n%f seconds, %f avg fps\n"), leveltime,demotime,f1/TICRATE,f2/f1); if (restorecv_vidwait != cv_vidwait.value) CV_SetValue(&cv_vidwait, restorecv_vidwait); - D_AdvanceDemo(); + D_StartTitle(); return true; } @@ -8376,7 +8376,7 @@ boolean G_CheckDemoStatus(void) if (modeattacking) M_EndModeAttackRun(); else - D_AdvanceDemo(); + D_StartTitle(); } return true;