try to make demo data handling a bit safer
- Use Z_Malloc to allocate demobuffer - Use Z_Free to free demobuffer - Make functions for freeing and resseting demobuffer - Always reset demobuffer when not saving
This commit is contained in:
1 parent
4a9b206d01
commit
103bb7e58d
5 files changed
+76
-78
No files matched your search
+8
-3
@@ -2882,9 +2882,14 @@ static void Command_Map_f(void)
|
||||
}
|
||||
}
|
||||
|
||||
// spend atleast 35 seconds in one map
|
||||
if (cv_demochangemap.value && demo.recording && demo.savemode != DSM_NOTSAVING && (timeinmap > 1463) && ((cv_demochangemap.value == 2 && newmapnum == gamemap) || newmapnum != gamemap))
|
||||
G_SaveDemo();
|
||||
if (cv_demochangemap.value && demo.recording)
|
||||
{
|
||||
// spend atleast 35 seconds in one map
|
||||
if (demo.savemode != DSM_NOTSAVING && (timeinmap > 1463) && ((cv_demochangemap.value == 2 && newmapnum == gamemap) || newmapnum != gamemap))
|
||||
G_SaveDemo();
|
||||
else
|
||||
G_ResetDemoRecording();
|
||||
}
|
||||
|
||||
fromlevelselect = false;
|
||||
D_MapChange(newmapnum, newgametype, newencoremode, newresetplayers, 0, false, false);
|
||||
|
||||
+53
-68
@@ -82,6 +82,8 @@ static void G_DoContinued(void);
|
||||
static void G_DoWorldDone(void);
|
||||
static void G_DoStartVote(void);
|
||||
|
||||
static void G_ResetDemoPlayback(char *pdemoname);
|
||||
|
||||
char mapmusname[7]; // Music name
|
||||
UINT16 mapmusflags; // Track and reset bit
|
||||
UINT32 mapmusposition; // Position to jump to
|
||||
@@ -3213,6 +3215,8 @@ void G_AfterIntermission(void)
|
||||
}
|
||||
else if (demo.recording && (modeattacking || demo.savemode != DSM_NOTSAVING))
|
||||
G_SaveDemo();
|
||||
else if (demo.recording)
|
||||
G_ResetDemoRecording();
|
||||
|
||||
if (modeattacking) // End the run.
|
||||
{
|
||||
@@ -3360,6 +3364,8 @@ void G_EndGame(void)
|
||||
{
|
||||
if (demo.recording && (modeattacking || demo.savemode != DSM_NOTSAVING))
|
||||
G_SaveDemo();
|
||||
else if (demo.recording)
|
||||
G_ResetDemoRecording();
|
||||
|
||||
// 1100 or competitive multiplayer, so go back to title screen.
|
||||
D_StartTitle();
|
||||
@@ -5888,10 +5894,7 @@ void G_RecordDemo(const char *name)
|
||||
INT32 maxsize;
|
||||
|
||||
demobuf.p = NULL;
|
||||
demo.recording = false;
|
||||
if (demobuf.buffer)
|
||||
free(demobuf.buffer);
|
||||
demobuf.buffer = NULL;
|
||||
G_ResetDemoRecording();
|
||||
demoend = NULL;
|
||||
|
||||
if (cv_recordmultiplayerdemos.value)
|
||||
@@ -5903,7 +5906,7 @@ void G_RecordDemo(const char *name)
|
||||
|
||||
maxsize = cv_maxdemosize.value*1024*1024;
|
||||
|
||||
demobuf.buffer = malloc(maxsize);
|
||||
demobuf.buffer = Z_Malloc(maxsize, PU_STATIC, NULL);
|
||||
demoend = demobuf.buffer + maxsize;
|
||||
|
||||
if (demobuf.buffer)
|
||||
@@ -5918,10 +5921,10 @@ void G_RecordMetal(void)
|
||||
INT32 maxsize;
|
||||
maxsize = cv_maxdemosize.value*1024*1024;
|
||||
if (demobuf.buffer)
|
||||
free(demobuf.buffer);
|
||||
Z_Free(demobuf.buffer);
|
||||
demobuf.p = NULL;
|
||||
metalrecording = false;
|
||||
demobuf.buffer = malloc(maxsize);
|
||||
demobuf.buffer = Z_Malloc(maxsize, PU_STATIC, NULL);
|
||||
demoend = demobuf.buffer + maxsize;
|
||||
|
||||
if (demobuf.buffer)
|
||||
@@ -6773,11 +6776,7 @@ void G_DoPlayDemo(char *defdemoname)
|
||||
snprintf(msg, 1024, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemoname);
|
||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||
M_StartMessage(msg, NULL, MM_NOTHING);
|
||||
Z_Free(pdemoname);
|
||||
Z_Free(demobuf.buffer);
|
||||
demobuf.buffer = NULL;
|
||||
demo.playback = false;
|
||||
demo.title = false;
|
||||
G_ResetDemoPlayback(pdemoname);
|
||||
return;
|
||||
}
|
||||
demobuf.p += 12; // DEMOHEADER
|
||||
@@ -6802,11 +6801,7 @@ void G_DoPlayDemo(char *defdemoname)
|
||||
snprintf(msg, 1024, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemoname);
|
||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||
M_StartMessage(msg, NULL, MM_NOTHING);
|
||||
Z_Free(pdemoname);
|
||||
Z_Free(demobuf.buffer);
|
||||
demobuf.buffer = NULL;
|
||||
demo.playback = false;
|
||||
demo.title = false;
|
||||
G_ResetDemoPlayback(pdemoname);
|
||||
return;
|
||||
}
|
||||
demobuf.p += 16; // demo checksum
|
||||
@@ -6815,11 +6810,7 @@ void G_DoPlayDemo(char *defdemoname)
|
||||
snprintf(msg, 1024, M_GetText("%s is the wrong type of recording and cannot be played.\n"), pdemoname);
|
||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||
M_StartMessage(msg, NULL, MM_NOTHING);
|
||||
Z_Free(pdemoname);
|
||||
Z_Free(demobuf.buffer);
|
||||
demobuf.buffer = NULL;
|
||||
demo.playback = false;
|
||||
demo.title = false;
|
||||
G_ResetDemoPlayback(pdemoname);
|
||||
return;
|
||||
}
|
||||
demobuf.p += 4; // "PLAY"
|
||||
@@ -6835,11 +6826,7 @@ void G_DoPlayDemo(char *defdemoname)
|
||||
snprintf(msg, 1024, M_GetText("%s is an alpha multiplayer replay and cannot be played.\n"), pdemoname);
|
||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||
M_StartMessage(msg, NULL, MM_NOTHING);
|
||||
Z_Free(pdemoname);
|
||||
Z_Free(demobuf.buffer);
|
||||
demobuf.buffer = NULL;
|
||||
demo.playback = false;
|
||||
demo.title = false;
|
||||
G_ResetDemoPlayback(pdemoname);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -6896,11 +6883,7 @@ void G_DoPlayDemo(char *defdemoname)
|
||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||
if (!CON_Ready()) // In the console they'll just see the notice there! No point pulling them out.
|
||||
M_StartMessage(msg, NULL, MM_NOTHING);
|
||||
Z_Free(pdemoname);
|
||||
Z_Free(demobuf.buffer);
|
||||
demobuf.buffer = NULL;
|
||||
demo.playback = false;
|
||||
demo.title = false;
|
||||
G_ResetDemoPlayback(pdemoname);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -6963,11 +6946,7 @@ void G_DoPlayDemo(char *defdemoname)
|
||||
snprintf(msg, 1024, M_GetText("%s features a character that is not currently loaded.\n"), pdemoname);
|
||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||
M_StartMessage(msg, NULL, MM_NOTHING);
|
||||
Z_Free(pdemoname);
|
||||
Z_Free(demobuf.buffer);
|
||||
demobuf.buffer = NULL;
|
||||
demo.playback = false;
|
||||
demo.title = false;
|
||||
G_ResetDemoPlayback(pdemoname);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -6977,11 +6956,7 @@ void G_DoPlayDemo(char *defdemoname)
|
||||
snprintf(msg, 1024, M_GetText("%s features a course that is not currently loaded.\n"), pdemoname);
|
||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||
M_StartMessage(msg, NULL, MM_NOTHING);
|
||||
Z_Free(pdemoname);
|
||||
Z_Free(demobuf.buffer);
|
||||
demobuf.buffer = NULL;
|
||||
demo.playback = false;
|
||||
demo.title = false;
|
||||
G_ResetDemoPlayback(pdemoname);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -7002,11 +6977,7 @@ void G_DoPlayDemo(char *defdemoname)
|
||||
snprintf(msg, 1024, M_GetText("%s contains no data to be played.\n"), pdemoname);
|
||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||
M_StartMessage(msg, NULL, MM_NOTHING);
|
||||
Z_Free(pdemoname);
|
||||
Z_Free(demobuf.buffer);
|
||||
demobuf.buffer = NULL;
|
||||
demo.playback = false;
|
||||
demo.title = false;
|
||||
G_ResetDemoPlayback(pdemoname);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -7046,11 +7017,7 @@ void G_DoPlayDemo(char *defdemoname)
|
||||
snprintf(msg, 1024, M_GetText("%s contains no data to be played.\n"), pdemoname);
|
||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||
M_StartMessage(msg, NULL, MM_NOTHING);
|
||||
Z_Free(pdemoname);
|
||||
Z_Free(demobuf.buffer);
|
||||
demobuf.buffer = NULL;
|
||||
demo.playback = false;
|
||||
demo.title = false;
|
||||
G_ResetDemoPlayback(pdemoname);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -7101,11 +7068,7 @@ void G_DoPlayDemo(char *defdemoname)
|
||||
snprintf(msg, 1024, M_GetText("%s is a Record Attack replay with spectators, and is thus invalid.\n"), pdemoname);
|
||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||
M_StartMessage(msg, NULL, MM_NOTHING);
|
||||
Z_Free(pdemoname);
|
||||
Z_Free(demobuf.buffer);
|
||||
demobuf.buffer = NULL;
|
||||
demo.playback = false;
|
||||
demo.title = false;
|
||||
G_ResetDemoPlayback(pdemoname);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -7116,11 +7079,7 @@ void G_DoPlayDemo(char *defdemoname)
|
||||
snprintf(msg, 1024, M_GetText("%s is a Record Attack replay with multiple players, and is thus invalid.\n"), pdemoname);
|
||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||
M_StartMessage(msg, NULL, MM_NOTHING);
|
||||
Z_Free(pdemoname);
|
||||
Z_Free(demobuf.buffer);
|
||||
demobuf.buffer = NULL;
|
||||
demo.playback = false;
|
||||
demo.title = false;
|
||||
G_ResetDemoPlayback(pdemoname);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -7763,7 +7722,7 @@ ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(void)
|
||||
#endif
|
||||
saved = FIL_WriteFile(va("%sMS.LMP", G_BuildMapName(gamemap)), demobuf.buffer, demobuf.p - demobuf.buffer); // finally output the file.
|
||||
}
|
||||
free(demobuf.buffer);
|
||||
Z_Free(demobuf.buffer);
|
||||
demobuf.buffer = NULL;
|
||||
metalrecording = false;
|
||||
if (saved)
|
||||
@@ -7876,14 +7835,41 @@ boolean G_CheckDemoStatus(void)
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
demo.recording = false;
|
||||
else if (demo.recording)
|
||||
G_ResetDemoRecording();
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
void G_ResetDemoRecording(void)
|
||||
{
|
||||
if (demobuf.buffer)
|
||||
Z_Free(demobuf.buffer);
|
||||
demobuf.buffer = NULL;
|
||||
demo.recording = false;
|
||||
}
|
||||
|
||||
static void G_ResetDemoPlayback(char *pdemoname)
|
||||
{
|
||||
if (pdemoname)
|
||||
Z_Free(pdemoname);
|
||||
if (demobuf.buffer)
|
||||
Z_Free(demobuf.buffer);
|
||||
demobuf.buffer = NULL;
|
||||
demo.playback = false;
|
||||
demo.title = false;
|
||||
}
|
||||
|
||||
void G_SaveDemo(void)
|
||||
{
|
||||
if (!demobuf.p)
|
||||
{
|
||||
CONS_Alert(CONS_ERROR, "Failed to save Demo. No Demo pointer exists!\n");
|
||||
// reset the demo buffer
|
||||
G_ResetDemoRecording();
|
||||
return;
|
||||
}
|
||||
|
||||
UINT8 *p = demobuf.buffer+16; // after version
|
||||
UINT32 length;
|
||||
#ifdef NOMD5
|
||||
@@ -7953,9 +7939,8 @@ void G_SaveDemo(void)
|
||||
|
||||
if (FIL_WriteFile(va(pandf, srb2home, demoname), demobuf.buffer, demobuf.p - demobuf.buffer)) // finally output the file.
|
||||
demo.savemode = DSM_SAVED;
|
||||
free(demobuf.buffer);
|
||||
demobuf.buffer = NULL;
|
||||
demo.recording = false;
|
||||
|
||||
G_ResetDemoRecording();
|
||||
|
||||
if (modeattacking != ATTACKING_RECORD)
|
||||
{
|
||||
|
||||
@@ -365,6 +365,7 @@ extern demoghost *ghosts;
|
||||
#define DFILE_ERROR_CANNOTLOAD 0x04 // Files are missing and cannot be loaded.
|
||||
#define DFILE_ERROR_EXTRAFILES 0x05 // Extra files outside of the replay's file list are loaded.
|
||||
|
||||
void G_ResetDemoRecording(void);
|
||||
void G_DoPlayDemo(char *defdemoname);
|
||||
void G_TimeDemo(const char *name);
|
||||
void G_AddGhost(char *defdemoname);
|
||||
|
||||
+12
-7
@@ -657,14 +657,19 @@ void P_Ticker(boolean run)
|
||||
|
||||
G_WriteAllGhostTics();
|
||||
|
||||
if (cv_recordmultiplayerdemos.value && (demo.savemode == DSM_NOTSAVING || demo.savemode == DSM_WILLAUTOSAVE))
|
||||
if (demo.savebutton && demo.savebutton + 3*TICRATE < leveltime && (InputDown(gc_lookback, 1) || (cv_usejoystick[0].value && axis > 0)))
|
||||
demo.savemode = DSM_TITLEENTRY;
|
||||
if (cv_recordmultiplayerdemos.value)
|
||||
{
|
||||
if (demo.savemode == DSM_NOTSAVING || demo.savemode == DSM_WILLAUTOSAVE)
|
||||
if (demo.savebutton && demo.savebutton + 3*TICRATE < leveltime && (InputDown(gc_lookback, 1) || (cv_usejoystick[0].value && axis > 0)))
|
||||
demo.savemode = DSM_TITLEENTRY;
|
||||
|
||||
//if there are no players left at all, stop demo recording
|
||||
//Demos that that dont have any players crash during playback, which can happen with dedicated servers
|
||||
if (cv_recordmultiplayerdemos.value && demo.savemode == DSM_WILLAUTOSAVE && !D_NumPlayers())
|
||||
G_SaveDemo();
|
||||
// if there are no players left at all, stop demo recording
|
||||
// Demos that that dont have any players crash during playback, which can happen with dedicated servers
|
||||
if (demo.savemode == DSM_WILLAUTOSAVE && !D_NumPlayers())
|
||||
G_SaveDemo();
|
||||
else
|
||||
G_ResetDemoRecording();
|
||||
}
|
||||
}
|
||||
else if (demo.playback) // Use Ghost data for consistency checks.
|
||||
{
|
||||
|
||||
@@ -616,6 +616,8 @@ void Y_Ticker(void)
|
||||
|
||||
if (demo.savemode == DSM_WILLSAVE || demo.savemode == DSM_WILLAUTOSAVE)
|
||||
G_SaveDemo();
|
||||
else
|
||||
G_ResetDemoRecording();
|
||||
}
|
||||
|
||||
// Check for pause or menu up in single player
|
||||
|
||||
Reference in new issue
Block a user