From 77d70aaa1bbf687c301c1da09a3e1bec6c2b5a74 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Mon, 31 Jul 2023 20:06:28 +0100
Subject: [PATCH] relocate savedata code from P_LoadLevel to G_InitNew as well
(this doesn't fix !1064 yet, this just makes the code a bit tidier)
---
src/g_game.c | 14 ++++++++++++++
src/p_setup.c | 12 ------------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/g_game.c b/src/g_game.c
index a1fd2e6ec6..f4e84512be 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -5061,6 +5061,7 @@ void G_InitNew(UINT8 pultmode, const char *mapname, boolean resetplayer, boolean
players[i].starpostx = players[i].starposty = players[i].starpostz = 0;
players[i].recordscore = 0;
+ // default lives, continues and score
if (netgame || multiplayer)
{
if (!FLS || (players[i].lives < 1))
@@ -5120,6 +5121,19 @@ void G_InitNew(UINT8 pultmode, const char *mapname, boolean resetplayer, boolean
automapactive = false;
imcontinuing = false;
+ // fetch saved data if available
+ if (savedata.lives > 0)
+ {
+ numgameovers = savedata.numgameovers;
+ players[consoleplayer].continues = savedata.continues;
+ players[consoleplayer].lives = savedata.lives;
+ players[consoleplayer].score = savedata.score;
+ if ((botingame = ((botskin = savedata.botskin) != 0)))
+ botcolor = skins[botskin-1].prefcolor;
+ emeralds = savedata.emeralds;
+ savedata.lives = 0;
+ }
+
if ((gametyperules & GTR_CUTSCENES) && !skipprecutscene && mapheaderinfo[gamemap-1]->precutscenenum && !modeattacking && !(marathonmode & MA_NOCUTSCENES)) // Start a custom cutscene.
F_StartCustomCutscene(mapheaderinfo[gamemap-1]->precutscenenum-1, true, resetplayer, FLS);
else
diff --git a/src/p_setup.c b/src/p_setup.c
index 175ab3328b..aac02417d4 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -7795,18 +7795,6 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
R_InitMobjInterpolators();
P_InitCachedActions();
- if (!fromnetsave && savedata.lives > 0)
- {
- numgameovers = savedata.numgameovers;
- players[consoleplayer].continues = savedata.continues;
- players[consoleplayer].lives = savedata.lives;
- players[consoleplayer].score = savedata.score;
- if ((botingame = ((botskin = savedata.botskin) != 0)))
- botcolor = skins[botskin-1].prefcolor;
- emeralds = savedata.emeralds;
- savedata.lives = 0;
- }
-
// internal game map
maplumpname = G_BuildMapName(gamemap);
lastloadedmaplumpnum = W_CheckNumForMap(maplumpname);
--
GitLab