Merge branch 'Saturn-Testing' into patchntexrefactor

This commit is contained in:
Alug committed 2025-04-18 11:43:06 +02:00
commit 167e8e9258
2 files changed
+16 -4

No files matched your search

+6 -2
View File
@@ -3167,10 +3167,14 @@ static void Command_connect(void)
M_ClearMenus(true);
if (Playing() || demo.title)
if (Playing() || demo.title || demo.playback)
{
if (demo.title)
if (demo.title || demo.playback)
{
G_CheckDemoStatus();
if (multiplayer && !demo.title) // dumb hack: G_CheckDemoStatus doesent call G_StopDemo for multiplayer demos
G_StopDemo();
}
if (netgame)
{
+10 -2
View File
@@ -8017,7 +8017,7 @@ void G_StopDemo(void)
demobuf.buffer = NULL;
demo.playback = false;
if (demo.title)
modeattacking = false;
modeattacking = ATTACKING_NONE;
demo.title = false;
demo.timing = false;
singletics = false;
@@ -8044,6 +8044,8 @@ void G_StopDemo(void)
if (gamestate == GS_VOTING)
Y_EndVote();
M_ClearMenus(true);
G_SetGamestate(GS_NULL);
wipegamestate = GS_NULL;
SV_StopServer();
@@ -8086,12 +8088,16 @@ boolean G_CheckDemoStatus(void)
I_Quit();
if (multiplayer && !demo.title)
{
G_ExitLevel();
}
else
{
UINT8 wasmodeattacking = modeattacking;
G_StopDemo();
if (modeattacking)
if (wasmodeattacking)
M_EndModeAttackRun();
else
D_StartTitle();
@@ -8130,6 +8136,8 @@ static void G_ResetDemoPlayback(char *pdemoname)
Z_Free(demobuf.buffer);
demobuf.buffer = NULL;
demo.playback = false;
if (demo.title)
modeattacking = ATTACKING_NONE;
demo.title = false;
}