From 55dfdc723fe534f8c908676d839bb1198d89da7c Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 29 Dec 2024 17:14:47 +0100 Subject: [PATCH 1/4] fix demo playback --- src/g_game.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index e48c53577..10367a293 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -6832,9 +6832,6 @@ void G_DoPlayDemo(char *defdemoname) boolean spectator; UINT8 slots[MAXPLAYERS], kartspeed[MAXPLAYERS], kartweight[MAXPLAYERS], numslots = 0; - if (demobuf.buffer == NULL) - return; - G_InitDemoRewind(); skin[16] = '\0'; From cbc3f8e917cafa63949520ca587bacc9dd74dd70 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 29 Dec 2024 17:38:36 +0100 Subject: [PATCH 2/4] add warning for non allocated demobuffer --- src/g_game.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index 10367a293..dd5a48a3d 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -6058,8 +6058,16 @@ void G_BeginRecording(void) if (!cv_recordmultiplayerdemos.value) return; - if (demobuf.p || demobuf.buffer == NULL) + if (demobuf.buffer == NULL) + { + CONS_Alert(CONS_ERROR, "Failed to allocate demo buffer\n"); return; + } + + if (demobuf.p) + { + return; + } memset(name,0,sizeof(name)); @@ -6215,7 +6223,13 @@ void G_BeginMetal(void) { mobj_t *mo = players[consoleplayer].mo; - if (demobuf.p || demobuf.buffer == NULL) + if (demobuf.buffer == NULL) + { + CONS_Alert(CONS_ERROR, "Failed to allocate demo buffer\n"); + return; + } + + if (demobuf.p) return; demobuf.p = demobuf.buffer; From 70e64d947145cdf21ccb896097102447738c5762 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 29 Dec 2024 17:43:09 +0100 Subject: [PATCH 3/4] reset demo recording in those places --- src/g_game.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/g_game.c b/src/g_game.c index dd5a48a3d..8f6103551 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -6056,16 +6056,21 @@ void G_BeginRecording(void) UINT8 *m; if (!cv_recordmultiplayerdemos.value) + { + G_ResetDemoRecording(); return; + } if (demobuf.buffer == NULL) { CONS_Alert(CONS_ERROR, "Failed to allocate demo buffer\n"); + G_ResetDemoRecording(); return; } if (demobuf.p) { + G_ResetDemoRecording(); return; } @@ -6225,12 +6230,18 @@ void G_BeginMetal(void) if (demobuf.buffer == NULL) { - CONS_Alert(CONS_ERROR, "Failed to allocate demo buffer\n"); + CONS_Alert(CONS_ERROR, "Failed to allocate metal demo buffer\n"); + metalrecording = false; return; } if (demobuf.p) + { + Z_Free(demobuf.buffer); + demobuf.buffer = NULL; + metalrecording = false; return; + } demobuf.p = demobuf.buffer; From b3323b7c2d19d7b2e73fe99f9fd926f3ba06b3f3 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 29 Dec 2024 17:45:20 +0100 Subject: [PATCH 4/4] change error msg --- src/g_game.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index 8f6103551..67e808476 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -6063,7 +6063,7 @@ void G_BeginRecording(void) if (demobuf.buffer == NULL) { - CONS_Alert(CONS_ERROR, "Failed to allocate demo buffer\n"); + CONS_Alert(CONS_ERROR, "No demo buffer allocated\n"); G_ResetDemoRecording(); return; } @@ -6230,7 +6230,7 @@ void G_BeginMetal(void) if (demobuf.buffer == NULL) { - CONS_Alert(CONS_ERROR, "Failed to allocate metal demo buffer\n"); + CONS_Alert(CONS_ERROR, "No metal demo buffer allocated\n"); metalrecording = false; return; }