stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-26 20:31:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove advancedemo

Browse source 
Just a weird, meaningless footgun waiting in the wings for someone to catch themselves on. D_StartTitle works plenty fine here!
This commit is contained in:
toaster 2022-10-26 20:40:19 +01:00
parent ab68f0dadd
commit 427944f633
4 changed files with 14 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/d_clisrv.c
View file

@ -5945,23 +5945,20 @@ boolean TryRunTics(tic_t realtics)
if (ticking) if (ticking)
{ {
if (advancedemo) // run the count * tics
D_StartTitle(); while (neededtic > gametic)
else {
// run the count * tics DEBFILE(va("============ Running tic %d (local %d)\n", gametic, localgametic));
while (neededtic > gametic)
{
DEBFILE(va("============ Running tic %d (local %d)\n", gametic, localgametic));
G_Ticker((gametic % NEWTICRATERATIO) == 0); G_Ticker((gametic % NEWTICRATERATIO) == 0);
ExtraDataTicker(); ExtraDataTicker();
gametic++; gametic++;
consistancy[gametic%TICQUEUE] = Consistancy(); 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. // 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) if (client && gamestate == GS_LEVEL && leveltime > 3 && neededtic <= gametic + cv_netticbuffer.value)
break; break;
} }
} }
else else
{ {

11
src/d_main.c
View file

@ -144,7 +144,6 @@ boolean sound_disabled = false;
boolean digital_disabled = false; boolean digital_disabled = false;
#endif #endif
boolean advancedemo;
#ifdef DEBUGFILE #ifdef DEBUGFILE
INT32 debugload = 0; INT32 debugload = 0;
#endif #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 // D_SRB2Main
// ========================================================================= // =========================================================================
@ -883,7 +873,6 @@ void D_StartTitle(void)
//demosequence = -1; //demosequence = -1;
gametype = GT_RACE; // SRB2kart gametype = GT_RACE; // SRB2kart
paused = false; paused = false;
advancedemo = false;
F_StartTitleScreen(); F_StartTitleScreen();
// Reset the palette -- SRB2Kart: actually never mind let's do this in the middle of every fade // Reset the palette -- SRB2Kart: actually never mind let's do this in the middle of every fade

4
src/d_main.h
View file

@ -17,8 +17,6 @@
#include "d_event.h" #include "d_event.h"
#include "w_wad.h" // for MAX_WADFILES #include "w_wad.h" // for MAX_WADFILES
extern boolean advancedemo;
// make sure not to write back the config until it's been correctly loaded // make sure not to write back the config until it's been correctly loaded
extern tic_t rendergametic; extern tic_t rendergametic;
@ -34,7 +32,6 @@ void D_SRB2Loop(void) FUNCNORETURN;
// D_SRB2Main() // D_SRB2Main()
// Not a globally visible function, just included for source reference, // Not a globally visible function, just included for source reference,
// calls all startup code, parses command line options. // calls all startup code, parses command line options.
// If not overrided by user input, calls D_AdvanceDemo.
// //
void D_SRB2Main(void); void D_SRB2Main(void);
@ -51,7 +48,6 @@ const char *D_Home(void);
// //
// BASE LEVEL // BASE LEVEL
// //
void D_AdvanceDemo(void);
void D_StartTitle(void); void D_StartTitle(void);
#endif //__D_MAIN__ #endif //__D_MAIN__

4
src/g_game.c
View file

@ -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); 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) if (restorecv_vidwait != cv_vidwait.value)
CV_SetValue(&cv_vidwait, restorecv_vidwait); CV_SetValue(&cv_vidwait, restorecv_vidwait);
D_AdvanceDemo(); D_StartTitle();
return true; return true;
} }
@ -8376,7 +8376,7 @@ boolean G_CheckDemoStatus(void)
if (modeattacking) if (modeattacking)
M_EndModeAttackRun(); M_EndModeAttackRun();
else else
D_AdvanceDemo(); D_StartTitle();
} }
return true; return true;