Demo variable fixes

This commit is contained in:
Sally Coolatta 2020-08-10 19:42:45 -04:00
parent 78d4d3c3e9
commit a6b2bc99de
4 changed files with 4 additions and 8 deletions

View file

@ -666,7 +666,7 @@ static void D_Display(void)
} }
// reset counters so timedemo doesn't count the wipe duration // reset counters so timedemo doesn't count the wipe duration
if (timingdemo) if (demo.timing)
{ {
framecount = 0; framecount = 0;
demostarttime = I_GetTime(); demostarttime = I_GetTime();

View file

@ -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}}; 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}; 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 nodrawers; // for comparative timing purposes
boolean noblit; // for comparative timing purposes boolean noblit; // for comparative timing purposes
tic_t demostarttime; // for comparative timing purposes tic_t demostarttime; // for comparative timing purposes
@ -3579,7 +3578,7 @@ static void G_StopTimingDemo(void)
if (!demotime) if (!demotime)
return; return;
G_StopDemo(); G_StopDemo();
timingdemo = false; demo.timing = false;
f1 = (double)demotime; f1 = (double)demotime;
f2 = (double)framecount*TICRATE; f2 = (double)framecount*TICRATE;

View file

@ -24,9 +24,10 @@ extern UINT8 *demo_p;
// DEMO playback/recording related stuff. // DEMO playback/recording related stuff.
// ====================================== // ======================================
// demoplaying back and demo recording
extern consvar_t cv_recordmultiplayerdemos, cv_netdemosyncquality; extern consvar_t cv_recordmultiplayerdemos, cv_netdemosyncquality;
extern tic_t demostarttime;
// Publicly-accessible demo vars // Publicly-accessible demo vars
struct demovars_s { struct demovars_s {
char titlename[65]; char titlename[65];

View file

@ -125,10 +125,6 @@ UINT8 numDemos = 0;
UINT32 demoDelayTime = 15*TICRATE; UINT32 demoDelayTime = 15*TICRATE;
UINT32 demoIdleTime = 3*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 netgame; // only true if packets are broadcast
boolean multiplayer; boolean multiplayer;
boolean playeringame[MAXPLAYERS]; boolean playeringame[MAXPLAYERS];