From a6b2bc99de64aa2a29f18b8b05fa6dca3ff759ca Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Mon, 10 Aug 2020 19:42:45 -0400 Subject: [PATCH] Demo variable fixes --- src/d_main.c | 2 +- src/g_demo.c | 3 +-- src/g_demo.h | 3 ++- src/g_game.c | 4 ---- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 3eb95a131..ffae0c0c6 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -666,7 +666,7 @@ static void D_Display(void) } // reset counters so timedemo doesn't count the wipe duration - if (timingdemo) + if (demo.timing) { framecount = 0; demostarttime = I_GetTime(); diff --git a/src/g_demo.c b/src/g_demo.c index df578be72..f0da4f9ec 100644 --- a/src/g_demo.c +++ b/src/g_demo.c @@ -48,7 +48,6 @@ consvar_t cv_recordmultiplayerdemos = {"netdemo_record", "Manual Save", CV_SAVE, static CV_PossibleValue_t netdemosyncquality_cons_t[] = {{1, "MIN"}, {35, "MAX"}, {0, NULL}}; consvar_t cv_netdemosyncquality = {"netdemo_syncquality", "1", CV_SAVE, netdemosyncquality_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -boolean timingdemo; // if true, exit with report on completion boolean nodrawers; // for comparative timing purposes boolean noblit; // for comparative timing purposes tic_t demostarttime; // for comparative timing purposes @@ -3579,7 +3578,7 @@ static void G_StopTimingDemo(void) if (!demotime) return; G_StopDemo(); - timingdemo = false; + demo.timing = false; f1 = (double)demotime; f2 = (double)framecount*TICRATE; diff --git a/src/g_demo.h b/src/g_demo.h index 6d9dd29e0..af4e6ea90 100644 --- a/src/g_demo.h +++ b/src/g_demo.h @@ -24,9 +24,10 @@ extern UINT8 *demo_p; // DEMO playback/recording related stuff. // ====================================== -// demoplaying back and demo recording extern consvar_t cv_recordmultiplayerdemos, cv_netdemosyncquality; +extern tic_t demostarttime; + // Publicly-accessible demo vars struct demovars_s { char titlename[65]; diff --git a/src/g_game.c b/src/g_game.c index 15860b94d..add8bdc94 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -125,10 +125,6 @@ UINT8 numDemos = 0; UINT32 demoDelayTime = 15*TICRATE; UINT32 demoIdleTime = 3*TICRATE; -boolean nodrawers; // for comparative timing purposes -boolean noblit; // for comparative timing purposes -static tic_t demostarttime; // for comparative timing purposes - boolean netgame; // only true if packets are broadcast boolean multiplayer; boolean playeringame[MAXPLAYERS];