diff --git a/src/editor.c b/src/editor.c index 0da0a2209c..bad7ef5825 100644 --- a/src/editor.c +++ b/src/editor.c @@ -432,7 +432,7 @@ static void editor_clear_map_for_editing() gNumGuestsInPark = 0; RCT2_GLOBAL(RCT2_ADDRESS_GUESTS_HEADING_FOR_PARK, uint16) = 0; RCT2_GLOBAL(RCT2_ADDRESS_LAST_GUESTS_IN_PARK, uint16) = 0; - RCT2_GLOBAL(RCT2_ADDRESS_GUEST_CHANGE_MODIFIER, uint16) = 0; + gGuestChangeModifier = 0; if (s6Header->type != S6_TYPE_SCENARIO) { research_populate_list_random(); research_remove_non_separate_vehicle_types(); diff --git a/src/peep/peep.h b/src/peep/peep.h index 4dc7482556..e14d579519 100644 --- a/src/peep/peep.h +++ b/src/peep/peep.h @@ -599,6 +599,7 @@ enum { FOR_ALL_PEEPS(sprite_index, peep) \ if (peep->type == PEEP_TYPE_STAFF) +#define gGuestChangeModifier RCT2_GLOBAL(RCT2_ADDRESS_GUEST_CHANGE_MODIFIER, uint8) #define gGuestInitialCash RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_CASH, money16) #define gGuestInitialHappiness RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_HAPPINESS, uint8) #define gGuestInitialHunger RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_HUNGER, uint8) diff --git a/src/windows/game_bottom_toolbar.c b/src/windows/game_bottom_toolbar.c index 59918da071..af38fe2a85 100644 --- a/src/windows/game_bottom_toolbar.c +++ b/src/windows/game_bottom_toolbar.c @@ -396,7 +396,7 @@ static void window_game_bottom_toolbar_draw_left_panel(rct_drawpixelinfo *dpi, r // Draw guests gfx_draw_string_centred( dpi, - STR_NUM_GUESTS + RCT2_GLOBAL(RCT2_ADDRESS_GUEST_CHANGE_MODIFIER, uint8), + STR_NUM_GUESTS + gGuestChangeModifier, x, y, (gHoverWidget.window_classification == WC_BOTTOM_TOOLBAR && gHoverWidget.widget_index == WIDX_GUESTS ? COLOUR_WHITE : w->colours[0] & 0x7F), &gNumGuestsInPark diff --git a/src/world/park.c b/src/world/park.c index 131925c50a..9212a80311 100644 --- a/src/world/park.c +++ b/src/world/park.c @@ -83,7 +83,7 @@ void park_init() gNumGuestsInPark = 0; RCT2_GLOBAL(RCT2_ADDRESS_LAST_GUESTS_IN_PARK, uint16) = 0; RCT2_GLOBAL(RCT2_ADDRESS_GUESTS_HEADING_FOR_PARK, uint16) = 0; - RCT2_GLOBAL(RCT2_ADDRESS_GUEST_CHANGE_MODIFIER, uint16) = 0; + gGuestChangeModifier = 0; gParkRating = 0; _guestGenerationProbability = 0; RCT2_GLOBAL(RCT2_TOTAL_RIDE_VALUE, uint16) = 0; @@ -595,7 +595,7 @@ void park_update_histories() if (changeInGuestsInPark < 20) guestChangeModifier = 0; } - RCT2_GLOBAL(RCT2_ADDRESS_GUEST_CHANGE_MODIFIER, uint8) = guestChangeModifier; + gGuestChangeModifier = guestChangeModifier; // Update park rating history for (int i = 31; i > 0; i--)