From c64d3333790ea961627385897c0a0450529c27c6 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Tue, 31 Oct 2023 16:32:24 +0100
Subject: [PATCH] Blood: fixed packSlots being cleared on loading a savegame.

Since the player refactor the order of operations had changed and this got called after reading the player, not before.
---
 source/games/blood/src/blood.cpp    | 3 +++
 source/games/blood/src/messages.cpp | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/games/blood/src/blood.cpp b/source/games/blood/src/blood.cpp
index 848fc2777..727dd1a81 100644
--- a/source/games/blood/src/blood.cpp
+++ b/source/games/blood/src/blood.cpp
@@ -391,6 +391,7 @@ void StartLevel(MapRecord* level, bool newgame)
 //
 //
 //---------------------------------------------------------------------------
+void packClear(DBloodPlayer* pPlayer);
 
 void NewLevel(MapRecord *sng, int skill, bool newgame)
 {
@@ -403,6 +404,8 @@ void GameInterface::NewGame(MapRecord *sng, int skill, bool)
 {
 	gGameOptions.uGameFlags = 0;
 	cheatReset();
+	DBloodPlayer* pPlayer = getPlayer(myconnectindex);
+	packClear(pPlayer);
 	NewLevel(sng, skill, true);
 }
 
diff --git a/source/games/blood/src/messages.cpp b/source/games/blood/src/messages.cpp
index 9e03ed2c6..8f7ca7e89 100644
--- a/source/games/blood/src/messages.cpp
+++ b/source/games/blood/src/messages.cpp
@@ -512,11 +512,8 @@ static cheatseq_t s_CheatInfo[] = {
 
 void cheatReset(void)
 {
-	DBloodPlayer* pPlayer = getPlayer(myconnectindex);
 	bPlayerCheated = 0;
-	playerSetGodMode(pPlayer, 0);
 	gNoClip = 0;
-	packClear(pPlayer);
 	gInfiniteAmmo = 0;
 	gFullMap = 0;
 }