pierre: fix Pierre not resetting across levels (#539)

Resolves #538.
LostArtefacts · May 5, 2022 · 2aa2c6b · 2aa2c6b
1 parent 0c7b716
commit 2aa2c6b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
 ## [Unreleased](https://github.com/rr-/Tomb1Main/compare/2.8...master)
-- ...
+- fixed Pierre not resetting across levels (#538, regression from 2.7)
 
 ## [2.8](https://github.com/rr-/Tomb1Main/compare/2.7...2.8) - 2022-05-04
 - added the option to pause sound in the inventory screen (#309)

diff --git a/src/game/objects/ai/pierre.c b/src/game/objects/ai/pierre.c
@@ -239,3 +239,8 @@ void Pierre_Control(int16_t item_num)
         m_PierreItemNum = NO_ITEM;
     }
 }
+
+void Pierre_Reset(void)
+{
+    m_PierreItemNum = NO_ITEM;
+}
diff --git a/src/game/objects/ai/pierre.h b/src/game/objects/ai/pierre.h
@@ -4,3 +4,4 @@
 
 void Pierre_Setup(OBJECT_INFO *obj);
 void Pierre_Control(int16_t item_num);
+void Pierre_Reset(void);
diff --git a/src/game/setup.c b/src/game/setup.c
@@ -142,6 +142,8 @@ void InitialiseGameFlags(void)
 
     g_LevelComplete = false;
     g_FlipEffect = -1;
+
+    Pierre_Reset();
 }
 
 void InitialiseLevelFlags(void)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,4 @@

		void Pierre_Setup(OBJECT_INFO *obj);
		void Pierre_Control(int16_t item_num);
		void Pierre_Reset(void);