1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00

Move staff_set_name to Staff

This commit is contained in:
ζeh Matt
2021-12-03 17:40:27 +02:00
parent a6870a97d4
commit a79e2a375a
3 changed files with 4 additions and 12 deletions

View File

@@ -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);
}
/**

View File

@@ -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,

View File

@@ -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);