From 17920b60390aa0c4afc84c09aa897a596f41705a Mon Sep 17 00:00:00 2001
From: Aaron van Geffen <aaron@aaronweb.net>
Date: Wed, 1 May 2024 23:10:25 +0200
Subject: [PATCH] Script: when changing staff type, reset state to walking

Reset state to walking to prevent invalid actions from carrying over
---
 src/openrct2/scripting/bindings/entity/ScStaff.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/openrct2/scripting/bindings/entity/ScStaff.cpp b/src/openrct2/scripting/bindings/entity/ScStaff.cpp
index 81a8e46813..1796decbac 100644
--- a/src/openrct2/scripting/bindings/entity/ScStaff.cpp
+++ b/src/openrct2/scripting/bindings/entity/ScStaff.cpp
@@ -84,6 +84,10 @@ namespace OpenRCT2::Scripting
                 peep->AssignedStaffType = StaffType::Entertainer;
                 peep->SpriteType = PeepSpriteType::EntertainerPanda;
             }
+
+            // Reset state to walking to prevent invalid actions from carrying over
+            peep->Action = PeepActionType::Walking;
+            peep->ActionSpriteType = peep->NextActionSpriteType = PeepActionSpriteType::None;
         }
     }