mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Move staff wage data to Staff.cpp/h

Browse Source
This commit is contained in:
Matt
2019-12-22 07:41:40 +01:00
parent c24112ffad
commit 79acb6a073
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/windows/Staff.cpp
View File

@@ -1106,7 +1106,7 @@ void window_staff_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
if (!(gParkFlags & PARK_FLAGS_NO_MONEY))
{
set_format_arg(0, money32, wage_table[peep->staff_type]);
set_format_arg(0, money32, gStaffWageTable[peep->staff_type]);
gfx_draw_string_left(dpi, STR_STAFF_STAT_WAGES, gCommonFormatArgs, COLOUR_BLACK, x, y);
y += LIST_ROW_HEIGHT;
}

2
src/openrct2-ui/windows/StaffList.cpp
View File

@@ -614,7 +614,7 @@ void window_staff_list_paint(rct_window* w, rct_drawpixelinfo* dpi)
if (!(gParkFlags & PARK_FLAGS_NO_MONEY))
{
set_format_arg(0, money32, wage_table[selectedTab]);
set_format_arg(0, money32, gStaffWageTable[selectedTab]);
gfx_draw_string_left(dpi, STR_COST_PER_MONTH, gCommonFormatArgs, COLOUR_BLACK, w->x + w->width - 155, w->y + 0x20);
}

12
src/openrct2/peep/Staff.cpp
View File

@@ -42,6 +42,18 @@
#include <algorithm>
#include <iterator>
/**
* Monthly staff wages
*
* rct2: 0x00992A00
*/
const money32 gStaffWageTable[STAFF_TYPE_COUNT] = {
MONEY(50, 00), // Handyman
MONEY(80, 00), // Mechanic
MONEY(60, 00), // Security guard
MONEY(55, 00), // Entertainer
};
// clang-format off
const rct_string_id StaffCostumeNames[] = {
STR_STAFF_OPTION_COSTUME_PANDA,

2
src/openrct2/peep/Staff.h
View File

@@ -62,6 +62,8 @@ enum ENTERTAINER_COSTUME : uint8_t
ENTERTAINER_COSTUME_COUNT
};
extern const money32 gStaffWageTable[STAFF_TYPE_COUNT];
extern const rct_string_id StaffCostumeNames[ENTERTAINER_COSTUME_COUNT];
extern uint32_t gStaffPatrolAreas[(STAFF_MAX_COUNT + STAFF_TYPE_COUNT) * STAFF_PATROL_AREA_SIZE];