thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

g_demo.c, M_EndModeAttackRun, D_ClearState - Unset demo.title in one specific place

Browse source 
Fixes returning from title demo to titlescreen
This commit is contained in:
toaster 2023-02-04 17:13:07 +00:00
parent e67fea3b84
commit c6dde48245
3 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/d_main.c
View file

@ -952,7 +952,7 @@ void D_ClearState(void)
memset(displayplayers, 0, sizeof(displayplayers)); memset(displayplayers, 0, sizeof(displayplayers));
memset(g_localplayers, 0, sizeof g_localplayers); memset(g_localplayers, 0, sizeof g_localplayers);
consoleplayer = 0; consoleplayer = 0;
//demosequence = -1; demo.title = false;
G_SetGametype(GT_RACE); // SRB2kart G_SetGametype(GT_RACE); // SRB2kart
paused = false; paused = false;
@ -975,7 +975,9 @@ void D_ClearState(void)
// //
void D_StartTitle(void) void D_StartTitle(void)
{ {
S_StopMusic(); if (!demo.title)
S_StopMusic();
D_ClearState(); D_ClearState();
F_StartTitleScreen(); F_StartTitleScreen();
M_ClearMenus(false); M_ClearMenus(false);

11
src/g_demo.c
View file

@ -3073,7 +3073,6 @@ void G_DoPlayDemo(char *defdemoname)
Z_Free(pdemoname); Z_Free(pdemoname);
Z_Free(demobuf.buffer); Z_Free(demobuf.buffer);
demo.playback = false; demo.playback = false;
demo.title = false;
return; return;
} }
demobuf.p += 12; // DEMOHEADER demobuf.p += 12; // DEMOHEADER
@ -3093,7 +3092,6 @@ void G_DoPlayDemo(char *defdemoname)
Z_Free(pdemoname); Z_Free(pdemoname);
Z_Free(demobuf.buffer); Z_Free(demobuf.buffer);
demo.playback = false; demo.playback = false;
demo.title = false;
return; return;
} }
@ -3111,7 +3109,6 @@ void G_DoPlayDemo(char *defdemoname)
Z_Free(pdemoname); Z_Free(pdemoname);
Z_Free(demobuf.buffer); Z_Free(demobuf.buffer);
demo.playback = false; demo.playback = false;
demo.title = false;
return; return;
} }
demobuf.p += 4; // "PLAY" demobuf.p += 4; // "PLAY"
@ -3131,7 +3128,6 @@ void G_DoPlayDemo(char *defdemoname)
Z_Free(pdemoname); Z_Free(pdemoname);
Z_Free(demobuf.buffer); Z_Free(demobuf.buffer);
demo.playback = false; demo.playback = false;
demo.title = false;
return; return;
} }
G_SetGametype(i); G_SetGametype(i);
@ -3189,7 +3185,6 @@ void G_DoPlayDemo(char *defdemoname)
Z_Free(pdemoname); Z_Free(pdemoname);
Z_Free(demobuf.buffer); Z_Free(demobuf.buffer);
demo.playback = false; demo.playback = false;
demo.title = false;
return; return;
} }
} }
@ -3204,7 +3199,6 @@ void G_DoPlayDemo(char *defdemoname)
Z_Free(pdemoname); Z_Free(pdemoname);
Z_Free(demobuf.buffer); Z_Free(demobuf.buffer);
demo.playback = false; demo.playback = false;
demo.title = false;
return; return;
} }
@ -3240,7 +3234,6 @@ void G_DoPlayDemo(char *defdemoname)
Z_Free(pdemoname); Z_Free(pdemoname);
Z_Free(demobuf.buffer); Z_Free(demobuf.buffer);
demo.playback = false; demo.playback = false;
demo.title = false;
return; return;
} }
@ -3258,7 +3251,6 @@ void G_DoPlayDemo(char *defdemoname)
Z_Free(pdemoname); Z_Free(pdemoname);
Z_Free(demobuf.buffer); Z_Free(demobuf.buffer);
demo.playback = false; demo.playback = false;
demo.title = false;
return; return;
} }
@ -3313,7 +3305,6 @@ void G_DoPlayDemo(char *defdemoname)
Z_Free(pdemoname); Z_Free(pdemoname);
Z_Free(demobuf.buffer); Z_Free(demobuf.buffer);
demo.playback = false; demo.playback = false;
demo.title = false;
return; return;
} }
} }
@ -3331,7 +3322,6 @@ void G_DoPlayDemo(char *defdemoname)
Z_Free(pdemoname); Z_Free(pdemoname);
Z_Free(demobuf.buffer); Z_Free(demobuf.buffer);
demo.playback = false; demo.playback = false;
demo.title = false;
return; return;
} }
@ -4028,7 +4018,6 @@ void G_StopDemo(void)
Z_Free(demobuf.buffer); Z_Free(demobuf.buffer);
demobuf.buffer = NULL; demobuf.buffer = NULL;
demo.playback = false; demo.playback = false;
demo.title = false;
demo.timing = false; demo.timing = false;
singletics = false; singletics = false;

4
src/menus/transient/pause-replay.c
View file

@ -50,15 +50,13 @@ menu_t PAUSE_PlaybackMenuDef = {
void M_EndModeAttackRun(void) void M_EndModeAttackRun(void)
{ {
boolean dotitle = demo.title;
G_CheckDemoStatus(); // Cancel recording G_CheckDemoStatus(); // Cancel recording
Command_ExitGame_f(); // Clear a bunch of state Command_ExitGame_f(); // Clear a bunch of state
modeattacking = ATTACKING_NONE; // Kept until now because of Command_ExitGame_f modeattacking = ATTACKING_NONE; // Kept until now because of Command_ExitGame_f
if (dotitle) if (demo.title == true)
{ {
D_StartTitle(); D_StartTitle();
} }