mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity

Display "No mechanics are hired!" instead of "Calling mechanic..." when no mechanics are hired (#5368)

Browse Source
This commit is contained in:
siomy11
2017-04-16 13:38:02 -07:00
committed by Michael Steenbeek
parent 8243501680
commit 7cf64d0bfe
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/language/en-GB.txt
View File

@@ -4349,6 +4349,7 @@ STR_6037 :Please select a valid RCT1 directory
STR_6038 :{SMALLFONT}{BLACK}If you have RCT1 installed, set this option to its directory to load scenarios, music, etc.
STR_6039 :{SMALLFONT}{BLACK}Quick demolish ride
STR_6040 :Edit Scenario Options
STR_6041 :{BLACK}No mechanics are hired!
#############
# Scenarios #

2
src/openrct2/localisation/string_ids.h
View File

@@ -3697,6 +3697,8 @@ enum {
STR_QUICK_DEMOLISH_RIDE = 6039,
STR_ACTION_EDIT_SCENARIO_OPTIONS = 6040,
STR_NO_MECHANICS_ARE_HIRED_MESSAGE = 6041,
// Have to include resource strings (from scenarios and objects) for the time being now that language is partially working
STR_COUNT = 32768

16
src/openrct2/windows/ride.c
View File

@@ -4009,15 +4009,25 @@ static void window_ride_maintenance_paint(rct_window *w, rct_drawpixelinfo *dpi)
// Mechanic status
if (ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN) {
rct_peep *peep;
uint16 spriteIndex;
switch (ride->mechanic_status) {
case RIDE_MECHANIC_STATUS_CALLING:
stringId = STR_CALLING_MECHANIC;
stringId = STR_NO_MECHANICS_ARE_HIRED_MESSAGE;
FOR_ALL_STAFF(spriteIndex, peep) {
if (peep->staff_type == STAFF_TYPE_MECHANIC) {
stringId = STR_CALLING_MECHANIC;
break;
}
}
break;
case RIDE_MECHANIC_STATUS_HEADING:
stringId = STR_MEHCANIC_IS_HEADING_FOR_THE_RIDE;
break;
case RIDE_MECHANIC_STATUS_FIXING:
case 4:
case RIDE_MECHANIC_STATUS_HAS_FIXED_STATION_BRAKES:
stringId = STR_MEHCANIC_IS_FIXING_THE_RIDE;
break;
default:
@@ -4026,7 +4036,7 @@ static void window_ride_maintenance_paint(rct_window *w, rct_drawpixelinfo *dpi)
}
if (stringId != 0) {
if (stringId == STR_CALLING_MECHANIC) {
if (stringId == STR_CALLING_MECHANIC || stringId == STR_NO_MECHANICS_ARE_HIRED_MESSAGE) {
gfx_draw_string_left_wrapped(dpi, NULL, x + 4, y, 280, stringId, COLOUR_BLACK);
} else {
rct_peep *mechanicSprite = &(get_sprite(ride->mechanic)->peep);