From 2aa2c6ba6871dff8719b97995213b8b1e54149e2 Mon Sep 17 00:00:00 2001
From: walkawayy <81546780+walkawayy@users.noreply.github.com>
Date: Thu, 5 May 2022 13:28:12 -0400
Subject: [PATCH] pierre: fix Pierre not resetting across levels (#539)

Resolves #538.
---
 CHANGELOG.md                 | 2 +-
 src/game/objects/ai/pierre.c | 5 +++++
 src/game/objects/ai/pierre.h | 1 +
 src/game/setup.c             | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eeae7a54a..444422b42 100644
--- 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
index 20dafa57c..17176d4c2 100644
--- 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
index bb1960f3d..ee26f523b 100644
--- 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
index 058a7fa79..87f4275b8 100644
--- 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)