mirror of https://github.com/OpenRCT2/OpenRCT2.git
add global macro: gGuestChangeModifier
This commit is contained in:
parent
467513616d
commit
65d749de7b
|
@ -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();
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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--)
|
||||
|
|
Loading…
Reference in New Issue