From a79e2a375a6a6fcaea3fed8805939ffdbc013733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Fri, 3 Dec 2021 17:40:27 +0200
Subject: [PATCH] Move staff_set_name to Staff

---
 src/openrct2-ui/windows/Staff.cpp         |  5 ++++-
 src/openrct2/actions/GameActionCompat.cpp | 10 ----------
 src/openrct2/entity/Staff.h               |  1 -
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp
index 3e7cc2e8f1..1d18b37490 100644
--- a/src/openrct2-ui/windows/Staff.cpp
+++ b/src/openrct2-ui/windows/Staff.cpp
@@ -18,6 +18,7 @@
 #include <openrct2/Input.h>
 #include <openrct2/actions/PeepPickupAction.h>
 #include <openrct2/actions/StaffSetCostumeAction.h>
+#include <openrct2/actions/StaffSetNameAction.h>
 #include <openrct2/actions/StaffSetOrdersAction.h>
 #include <openrct2/actions/StaffSetPatrolAreaAction.h>
 #include <openrct2/config/Config.h>
@@ -1320,7 +1321,9 @@ void WindowStaffOverviewTextInput(rct_window* w, rct_widgetindex widgetIndex, ch
 
     if (text == nullptr)
         return;
-    staff_set_name(w->number, text);
+
+    auto gameAction = StaffSetNameAction(w->number, text);
+    GameActions::Execute(&gameAction);
 }
 
 /**
diff --git a/src/openrct2/actions/GameActionCompat.cpp b/src/openrct2/actions/GameActionCompat.cpp
index 5b29dc8842..86638b3de0 100644
--- a/src/openrct2/actions/GameActionCompat.cpp
+++ b/src/openrct2/actions/GameActionCompat.cpp
@@ -21,7 +21,6 @@
 #include "RideSetNameAction.h"
 #include "RideSetStatusAction.h"
 #include "SetParkEntranceFeeAction.h"
-#include "StaffSetNameAction.h"
 #include "WallRemoveAction.h"
 
 #pragma region PlaceParkEntranceAction
@@ -118,15 +117,6 @@ void guest_set_name(uint16_t spriteIndex, const char* name)
 }
 #pragma endregion
 
-#pragma region StaffSetName
-
-void staff_set_name(uint16_t spriteIndex, const char* name)
-{
-    auto gameAction = StaffSetNameAction(spriteIndex, name);
-    GameActions::Execute(&gameAction);
-}
-#pragma endregion
-
 #pragma region MazeSetTrack
 money32 maze_set_track(
     uint16_t x, uint16_t y, uint16_t z, uint8_t flags, bool initialPlacement, uint8_t direction, ride_id_t rideIndex,
diff --git a/src/openrct2/entity/Staff.h b/src/openrct2/entity/Staff.h
index 75bdc61048..ee9a72b088 100644
--- a/src/openrct2/entity/Staff.h
+++ b/src/openrct2/entity/Staff.h
@@ -156,7 +156,6 @@ extern colour_t gStaffMechanicColour;
 extern colour_t gStaffSecurityColour;
 
 void staff_reset_modes();
-void staff_set_name(uint16_t spriteIndex, const char* name);
 void staff_update_greyed_patrol_areas();
 bool staff_is_patrol_area_set_for_type(StaffType type, const CoordsXY& coords);
 colour_t staff_get_colour(StaffType staffType);