mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename Peep::peep_flags to PeepFlags

This commit is contained in:
Tulio Leao 2020-05-31 17:45:52 -03:00 committed by Gymnasiast
parent 53bff03a3f
commit a2a0fad886
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
19 changed files with 131 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2-ui/windows/Guest.cpp
View File

@ -724,7 +724,7 @@ void window_guest_overview_mouse_up(rct_window* w, rct_widgetindex widgetIndex)
break;
case WIDX_TRACK:
{
uint32_t flags = peep->peep_flags ^ PEEP_FLAGS_TRACKING;
uint32_t flags = peep->PeepFlags ^ PEEP_FLAGS_TRACKING;
auto guestSetFlagsAction = GuestSetFlagsAction(w->number, flags);
GameActions::Execute(&guestSetFlagsAction);
@ -1136,7 +1136,7 @@ void window_guest_overview_invalidate(rct_window* w)
auto peep = GET_PEEP(w->number);
w->pressed_widgets &= ~(1 << WIDX_TRACK);
if (peep->peep_flags & PEEP_FLAGS_TRACKING)
if (peep->PeepFlags & PEEP_FLAGS_TRACKING)
{
w->pressed_widgets |= (1 << WIDX_TRACK);
}

4
src/openrct2-ui/windows/GuestList.cpp
View File

@ -778,7 +778,7 @@ static void window_guest_list_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi,
gfx_draw_sprite(dpi, get_peep_face_sprite_small(peep), 118, y + 1, 0);
// Tracking icon
if (peep->peep_flags & PEEP_FLAGS_TRACKING)
if (peep->PeepFlags & PEEP_FLAGS_TRACKING)
gfx_draw_sprite(dpi, STR_ENTER_SELECTION_SIZE, 112, y + 1, 0);
// Action
@ -1041,7 +1041,7 @@ static void window_guest_list_find_groups()
static bool guest_should_be_visible(Peep* peep)
{
if (_window_guest_list_tracking_only && !(peep->peep_flags & PEEP_FLAGS_TRACKING))
if (_window_guest_list_tracking_only && !(peep->PeepFlags & PEEP_FLAGS_TRACKING))
return false;
if (_window_guest_list_filter_name[0] != '\0')

2
src/openrct2/GameStateSnapshots.cpp
View File

@ -284,7 +284,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, guest_heading_to_ride_id);
COMPARE_FIELD(Peep, staff_orders);
COMPARE_FIELD(Peep, photo1_ride_ref);
COMPARE_FIELD(Peep, peep_flags);
COMPARE_FIELD(Peep, PeepFlags);
COMPARE_FIELD(Peep, PathfindGoal);
for (int i = 0; i < 4; i++)
{

2
src/openrct2/actions/GuestSetFlagsAction.hpp
View File

@ -63,7 +63,7 @@ public:
return MakeResult(GA_ERROR::INVALID_PARAMETERS, STR_CANT_CHANGE_THIS);
}
peep->peep_flags = _newFlags;
peep->PeepFlags = _newFlags;
return std::make_unique<GameActionResult>();
}

4
src/openrct2/actions/SetCheatAction.hpp
View File

@ -589,7 +589,7 @@ private:
// Clear the 'red-faced with anger' status if we're making the guest happy
if (value > 0)
{
peep->peep_flags &= ~PEEP_FLAGS_ANGRY;
peep->PeepFlags &= ~PEEP_FLAGS_ANGRY;
peep->Angriness = 0;
}
break;
@ -722,7 +722,7 @@ private:
{
if (scenario_rand_max(6) == 0)
{
peep->peep_flags |= PEEP_FLAGS_EXPLODE;
peep->PeepFlags |= PEEP_FLAGS_EXPLODE;
}
}
}

2
src/openrct2/actions/StaffHireNewAction.hpp
View File

@ -168,7 +168,7 @@ private:
newPeep->path_check_optimisation = 0;
newPeep->type = PEEP_TYPE_STAFF;
newPeep->outside_of_park = 0;
newPeep->peep_flags = 0;
newPeep->PeepFlags = 0;
newPeep->PaidToEnter = 0;
newPeep->PaidOnRides = 0;
newPeep->PaidOnFood = 0;

4
src/openrct2/actions/StaffSetCostumeAction.hpp
View File

@ -95,10 +95,10 @@ public:
auto spriteType = static_cast<PeepSpriteType>(_costume + 4);
peep->sprite_type = spriteType;
peep->peep_flags &= ~PEEP_FLAGS_SLOW_WALK;
peep->PeepFlags &= ~PEEP_FLAGS_SLOW_WALK;
if (peep_slow_walking_types[spriteType])
{
peep->peep_flags |= PEEP_FLAGS_SLOW_WALK;
peep->PeepFlags |= PEEP_FLAGS_SLOW_WALK;
}
peep->action_frame = 0;
peep->UpdateCurrentActionSpriteType();

174
src/openrct2/peep/Guest.cpp
View File

@ -498,22 +498,22 @@ void Guest::GivePassingPeepsIceCream(Guest* passingPeep)
*/
void Guest::UpdateEasterEggInteractions()
{
if (peep_flags & PEEP_FLAGS_PURPLE)
if (PeepFlags & PEEP_FLAGS_PURPLE)
{
ApplyEasterEggToNearbyGuests(&Guest::GivePassingPeepsPurpleClothes);
}
if (peep_flags & PEEP_FLAGS_PIZZA)
if (PeepFlags & PEEP_FLAGS_PIZZA)
{
ApplyEasterEggToNearbyGuests(&Guest::GivePassingPeepsPizza);
}
if (peep_flags & PEEP_FLAGS_CONTAGIOUS)
if (PeepFlags & PEEP_FLAGS_CONTAGIOUS)
{
ApplyEasterEggToNearbyGuests(&Guest::MakePassingPeepsSick);
}
if (peep_flags & PEEP_FLAGS_JOY)
if (PeepFlags & PEEP_FLAGS_JOY)
{
if (scenario_rand() <= 1456)
{
@ -527,7 +527,7 @@ void Guest::UpdateEasterEggInteractions()
}
}
if (peep_flags & PEEP_FLAGS_ICE_CREAM)
if (PeepFlags & PEEP_FLAGS_ICE_CREAM)
{
ApplyEasterEggToNearbyGuests(&Guest::GivePassingPeepsIceCream);
}
@ -550,28 +550,28 @@ int32_t Guest::GetEasterEggNameId() const
void Guest::HandleEasterEggName()
{
peep_flags &= ~PEEP_FLAGS_WAVING;
PeepFlags &= ~PEEP_FLAGS_WAVING;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_KATIE_BRAYSHAW))
{
peep_flags |= PEEP_FLAGS_WAVING;
PeepFlags |= PEEP_FLAGS_WAVING;
}
peep_flags &= ~PEEP_FLAGS_PHOTO;
PeepFlags &= ~PEEP_FLAGS_PHOTO;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_CHRIS_SAWYER))
{
peep_flags |= PEEP_FLAGS_PHOTO;
PeepFlags |= PEEP_FLAGS_PHOTO;
}
peep_flags &= ~PEEP_FLAGS_PAINTING;
PeepFlags &= ~PEEP_FLAGS_PAINTING;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_SIMON_FOSTER))
{
peep_flags |= PEEP_FLAGS_PAINTING;
PeepFlags |= PEEP_FLAGS_PAINTING;
}
peep_flags &= ~PEEP_FLAGS_WOW;
PeepFlags &= ~PEEP_FLAGS_WOW;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_JOHN_WARDLEY))
{
peep_flags |= PEEP_FLAGS_WOW;
PeepFlags |= PEEP_FLAGS_WOW;
}
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_MELANIE_WARN))
@ -584,94 +584,94 @@ void Guest::HandleEasterEggName()
nausea_target = 0;
}
peep_flags &= ~PEEP_FLAGS_LITTER;
PeepFlags &= ~PEEP_FLAGS_LITTER;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_LISA_STIRLING))
{
peep_flags |= PEEP_FLAGS_LITTER;
PeepFlags |= PEEP_FLAGS_LITTER;
}
peep_flags &= ~PEEP_FLAGS_LOST;
PeepFlags &= ~PEEP_FLAGS_LOST;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_DONALD_MACRAE))
{
peep_flags |= PEEP_FLAGS_LOST;
PeepFlags |= PEEP_FLAGS_LOST;
}
peep_flags &= ~PEEP_FLAGS_HUNGER;
PeepFlags &= ~PEEP_FLAGS_HUNGER;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_KATHERINE_MCGOWAN))
{
peep_flags |= PEEP_FLAGS_HUNGER;
PeepFlags |= PEEP_FLAGS_HUNGER;
}
peep_flags &= ~PEEP_FLAGS_TOILET;
PeepFlags &= ~PEEP_FLAGS_TOILET;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_FRANCES_MCGOWAN))
{
peep_flags |= PEEP_FLAGS_TOILET;
PeepFlags |= PEEP_FLAGS_TOILET;
}
peep_flags &= ~PEEP_FLAGS_CROWDED;
PeepFlags &= ~PEEP_FLAGS_CROWDED;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_CORINA_MASSOURA))
{
peep_flags |= PEEP_FLAGS_CROWDED;
PeepFlags |= PEEP_FLAGS_CROWDED;
}
peep_flags &= ~PEEP_FLAGS_HAPPINESS;
PeepFlags &= ~PEEP_FLAGS_HAPPINESS;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_CAROL_YOUNG))
{
peep_flags |= PEEP_FLAGS_HAPPINESS;
PeepFlags |= PEEP_FLAGS_HAPPINESS;
}
peep_flags &= ~PEEP_FLAGS_NAUSEA;
PeepFlags &= ~PEEP_FLAGS_NAUSEA;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_MIA_SHERIDAN))
{
peep_flags |= PEEP_FLAGS_NAUSEA;
PeepFlags |= PEEP_FLAGS_NAUSEA;
}
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_KATIE_RODGER))
{
peep_flags |= PEEP_FLAGS_LEAVING_PARK;
peep_flags &= ~PEEP_FLAGS_PARK_ENTRANCE_CHOSEN;
PeepFlags |= PEEP_FLAGS_LEAVING_PARK;
PeepFlags &= ~PEEP_FLAGS_PARK_ENTRANCE_CHOSEN;
}
peep_flags &= ~PEEP_FLAGS_PURPLE;
PeepFlags &= ~PEEP_FLAGS_PURPLE;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_EMMA_GARRELL))
{
peep_flags |= PEEP_FLAGS_PURPLE;
PeepFlags |= PEEP_FLAGS_PURPLE;
}
peep_flags &= ~PEEP_FLAGS_PIZZA;
PeepFlags &= ~PEEP_FLAGS_PIZZA;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_JOANNE_BARTON))
{
peep_flags |= PEEP_FLAGS_PIZZA;
PeepFlags |= PEEP_FLAGS_PIZZA;
}
peep_flags &= ~PEEP_FLAGS_CONTAGIOUS;
PeepFlags &= ~PEEP_FLAGS_CONTAGIOUS;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_FELICITY_ANDERSON))
{
peep_flags |= PEEP_FLAGS_CONTAGIOUS;
PeepFlags |= PEEP_FLAGS_CONTAGIOUS;
}
peep_flags &= ~PEEP_FLAGS_JOY;
PeepFlags &= ~PEEP_FLAGS_JOY;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_KATIE_SMITH))
{
peep_flags |= PEEP_FLAGS_JOY;
PeepFlags |= PEEP_FLAGS_JOY;
}
peep_flags &= ~PEEP_FLAGS_ANGRY;
PeepFlags &= ~PEEP_FLAGS_ANGRY;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_EILIDH_BELL))
{
peep_flags |= PEEP_FLAGS_ANGRY;
PeepFlags |= PEEP_FLAGS_ANGRY;
}
peep_flags &= ~PEEP_FLAGS_ICE_CREAM;
PeepFlags &= ~PEEP_FLAGS_ICE_CREAM;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_NANCY_STILLWAGON))
{
peep_flags |= PEEP_FLAGS_ICE_CREAM;
PeepFlags |= PEEP_FLAGS_ICE_CREAM;
}
peep_flags &= ~PEEP_FLAGS_HERE_WE_ARE;
PeepFlags &= ~PEEP_FLAGS_HERE_WE_ARE;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_DAVID_ELLIS))
{
peep_flags |= PEEP_FLAGS_HERE_WE_ARE;
PeepFlags |= PEEP_FLAGS_HERE_WE_ARE;
}
}
@ -699,7 +699,7 @@ void Guest::Tick128UpdateGuest(int32_t index)
* which is the condition for calling this function, is
* to reduce how often the content in this conditional
* is executed to once every four calls. */
if (peep_flags & PEEP_FLAGS_CROWDED)
if (PeepFlags & PEEP_FLAGS_CROWDED)
{
PeepThoughtType thought_type = crowded_thoughts[scenario_rand() & 0xF];
if (thought_type != PEEP_THOUGHT_TYPE_NONE)
@ -708,7 +708,7 @@ void Guest::Tick128UpdateGuest(int32_t index)
}
}
if (peep_flags & PEEP_FLAGS_EXPLODE && x != LOCATION_NULL)
if (PeepFlags & PEEP_FLAGS_EXPLODE && x != LOCATION_NULL)
{
if (state == PEEP_STATE_WALKING || state == PEEP_STATE_SITTING)
{
@ -722,28 +722,28 @@ void Guest::Tick128UpdateGuest(int32_t index)
}
else
{
peep_flags &= ~PEEP_FLAGS_EXPLODE;
PeepFlags &= ~PEEP_FLAGS_EXPLODE;
}
}
if (peep_flags & PEEP_FLAGS_HUNGER)
if (PeepFlags & PEEP_FLAGS_HUNGER)
{
if (hunger >= 15)
hunger -= 15;
}
if (peep_flags & PEEP_FLAGS_TOILET)
if (PeepFlags & PEEP_FLAGS_TOILET)
{
if (toilet <= 180)
toilet += 50;
}
if (peep_flags & PEEP_FLAGS_HAPPINESS)
if (PeepFlags & PEEP_FLAGS_HAPPINESS)
{
happiness_target = 5;
}
if (peep_flags & PEEP_FLAGS_NAUSEA)
if (PeepFlags & PEEP_FLAGS_NAUSEA)
{
nausea_target = 200;
if (nausea <= 130)
@ -778,7 +778,7 @@ void Guest::Tick128UpdateGuest(int32_t index)
{
TimeOnRide = std::min(255, TimeOnRide + 1);
if (peep_flags & PEEP_FLAGS_WOW)
if (PeepFlags & PEEP_FLAGS_WOW)
{
InsertNewThought(PEEP_THOUGHT_TYPE_WOW2, PEEP_THOUGHT_ITEM_NONE);
}
@ -802,7 +802,7 @@ void Guest::Tick128UpdateGuest(int32_t index)
}
}
if (state == PEEP_STATE_WALKING && outside_of_park == 0 && !(peep_flags & PEEP_FLAGS_LEAVING_PARK) && no_of_rides == 0
if (state == PEEP_STATE_WALKING && outside_of_park == 0 && !(PeepFlags & PEEP_FLAGS_LEAVING_PARK) && no_of_rides == 0
&& guest_heading_to_ride_id == RIDE_ID_NULL)
{
uint32_t time_duration = gScenarioTicks - time_in_park;
@ -840,7 +840,7 @@ void Guest::Tick128UpdateGuest(int32_t index)
uint8_t num_thoughts = 0;
PeepThoughtType possible_thoughts[5];
if (peep_flags & PEEP_FLAGS_LEAVING_PARK)
if (PeepFlags & PEEP_FLAGS_LEAVING_PARK)
{
possible_thoughts[num_thoughts++] = PEEP_THOUGHT_TYPE_GO_HOME;
}
@ -1255,7 +1255,7 @@ void Guest::UpdateSitting()
return;
}
if ((peep_flags & PEEP_FLAGS_LEAVING_PARK))
if ((PeepFlags & PEEP_FLAGS_LEAVING_PARK))
{
SetState(PEEP_STATE_WALKING);
@ -1390,13 +1390,13 @@ bool Guest::HasEmptyContainer() const
*/
void Guest::CheckIfLost()
{
if (!(peep_flags & PEEP_FLAGS_LOST))
if (!(PeepFlags & PEEP_FLAGS_LOST))
{
if (ride_get_count() < 2)
return;
peep_flags ^= PEEP_FLAGS_21;
PeepFlags ^= PEEP_FLAGS_21;
if (!(peep_flags & PEEP_FLAGS_21))
if (!(PeepFlags & PEEP_FLAGS_21))
return;
TimeLost++;
@ -1448,7 +1448,7 @@ void Guest::CheckCantFindRide()
*/
void Guest::CheckCantFindExit()
{
if (!(peep_flags & PEEP_FLAGS_LEAVING_PARK))
if (!(PeepFlags & PEEP_FLAGS_LEAVING_PARK))
return;
// Peeps who can't find the park exit will continue to get less happy until they find it.
@ -1684,7 +1684,7 @@ loc_69B221:
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;
UpdateSpriteType();
if (peep_flags & PEEP_FLAGS_TRACKING)
if (PeepFlags & PEEP_FLAGS_TRACKING)
{
auto ft = Formatter::Common();
FormatNameTo(ft);
@ -1784,9 +1784,9 @@ void Guest::OnEnterRide(ride_id_t rideIndex)
void Guest::OnExitRide(ride_id_t rideIndex)
{
auto ride = get_ride(rideIndex);
if (peep_flags & PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE)
if (PeepFlags & PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE)
{
peep_flags &= ~PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE;
PeepFlags &= ~PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE;
FavouriteRide = rideIndex;
// TODO fix this flag name or add another one
window_invalidate_flags |= PEEP_INVALIDATE_STAFF_STATS;
@ -1795,8 +1795,8 @@ void Guest::OnExitRide(ride_id_t rideIndex)
nausea = nausea_target;
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_STATS;
if (peep_flags & PEEP_FLAGS_LEAVING_PARK)
peep_flags &= ~(PEEP_FLAGS_PARK_ENTRANCE_CHOSEN);
if (PeepFlags & PEEP_FLAGS_LEAVING_PARK)
PeepFlags &= ~(PEEP_FLAGS_PARK_ENTRANCE_CHOSEN);
if (ride != nullptr && peep_should_go_on_ride_again(this, ride))
{
@ -1852,7 +1852,7 @@ void Guest::PickRideToGoOn()
return;
if (guest_heading_to_ride_id != RIDE_ID_NULL)
return;
if (peep_flags & PEEP_FLAGS_LEAVING_PARK)
if (PeepFlags & PEEP_FLAGS_LEAVING_PARK)
return;
if (HasFood())
return;
@ -1977,7 +1977,7 @@ bool Guest::ShouldGoOnRide(Ride* ride, int32_t entranceNum, bool atQueue, bool t
if (!(RideTypeDescriptors[ride->type].Flags & RIDE_TYPE_FLAG_TRANSPORT_RIDE) || ride->value == RIDE_VALUE_UNDEFINED
|| ride_get_price(ride) != 0)
{
if (peep_flags & PEEP_FLAGS_LEAVING_PARK)
if (PeepFlags & PEEP_FLAGS_LEAVING_PARK)
{
ChoseNotToGoOnRide(ride, peepAtRide, false);
return false;
@ -2200,7 +2200,7 @@ bool Guest::ShouldGoOnRide(Ride* ride, int32_t entranceNum, bool atQueue, bool t
if (value != 0xFFFF && !peep_has_voucher_for_free_ride(this, ride) && !(gParkFlags & PARK_FLAGS_NO_MONEY))
{
// The amount peeps are willing to pay is decreased by 75% if they had to pay to enter the park.
if (peep_flags & PEEP_FLAGS_HAS_PAID_FOR_PARK_ENTRY)
if (PeepFlags & PEEP_FLAGS_HAS_PAID_FOR_PARK_ENTRY)
value /= 4;
// Peeps won't pay more than twice the value of the ride.
@ -2225,7 +2225,7 @@ bool Guest::ShouldGoOnRide(Ride* ride, int32_t entranceNum, bool atQueue, bool t
{
if (!(gParkFlags & PARK_FLAGS_NO_MONEY))
{
if (!(peep_flags & PEEP_FLAGS_HAS_PAID_FOR_PARK_ENTRY))
if (!(PeepFlags & PEEP_FLAGS_HAS_PAID_FOR_PARK_ENTRY))
{
InsertNewThought(PEEP_THOUGHT_TYPE_GOOD_VALUE, ride->id);
}
@ -2711,14 +2711,14 @@ static int16_t peep_calculate_ride_satisfaction(Guest* peep, Ride* ride)
*/
static void peep_update_favourite_ride(Peep* peep, Ride* ride)
{
peep->peep_flags &= ~PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE;
peep->PeepFlags &= ~PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE;
uint8_t peepRideRating = std::clamp((ride->excitement / 4) + peep->happiness, 0, PEEP_MAX_HAPPINESS);
if (peepRideRating >= peep->FavouriteRideRating)
{
if (peep->happiness >= 160 && peep->happiness_target >= 160)
{
peep->FavouriteRideRating = peepRideRating;
peep->peep_flags |= PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE;
peep->PeepFlags |= PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE;
}
}
}
@ -3083,7 +3083,7 @@ static void peep_decide_whether_to_leave_park(Peep* peep)
/* Peeps that are happy enough, have enough energy and
* (if appropriate) have enough money will always stay
* in the park. */
if (!(peep->peep_flags & PEEP_FLAGS_LEAVING_PARK))
if (!(peep->PeepFlags & PEEP_FLAGS_LEAVING_PARK))
{
if (gParkFlags & PARK_FLAGS_NO_MONEY)
{
@ -3118,7 +3118,7 @@ static void peep_decide_whether_to_leave_park(Peep* peep)
static void peep_leave_park(Peep* peep)
{
peep->guest_heading_to_ride_id = RIDE_ID_NULL;
if (peep->peep_flags & PEEP_FLAGS_LEAVING_PARK)
if (peep->PeepFlags & PEEP_FLAGS_LEAVING_PARK)
{
if (peep->peep_is_lost_countdown < 60)
{
@ -3128,8 +3128,8 @@ static void peep_leave_park(Peep* peep)
else
{
peep->peep_is_lost_countdown = 254;
peep->peep_flags |= PEEP_FLAGS_LEAVING_PARK;
peep->peep_flags &= ~PEEP_FLAGS_PARK_ENTRANCE_CHOSEN;
peep->PeepFlags |= PEEP_FLAGS_LEAVING_PARK;
peep->PeepFlags &= ~PEEP_FLAGS_PARK_ENTRANCE_CHOSEN;
}
peep->InsertNewThought(PEEP_THOUGHT_TYPE_GO_HOME, PEEP_THOUGHT_ITEM_NONE);
@ -3146,7 +3146,7 @@ template<typename T> static void peep_head_for_nearest_ride(Guest* peep, bool co
{
return;
}
if (peep->peep_flags & PEEP_FLAGS_LEAVING_PARK)
if (peep->PeepFlags & PEEP_FLAGS_LEAVING_PARK)
return;
if (peep->x == LOCATION_NULL)
return;
@ -3325,7 +3325,7 @@ static bool peep_should_use_cash_machine(Peep* peep, ride_id_t rideIndex)
{
if (gParkFlags & PARK_FLAGS_NO_MONEY)
return false;
if (peep->peep_flags & PEEP_FLAGS_LEAVING_PARK)
if (peep->PeepFlags & PEEP_FLAGS_LEAVING_PARK)
return false;
if (peep->cash_in_pocket > MONEY(20, 00))
return false;
@ -3883,7 +3883,7 @@ void Guest::UpdateRideFreeVehicleEnterRide(Ride* ride)
window_invalidate_by_number(WC_RIDE, current_ride);
}
if (peep_flags & PEEP_FLAGS_TRACKING)
if (PeepFlags & PEEP_FLAGS_TRACKING)
{
auto nameArgLen = FormatNameTo(gCommonFormatArgs);
ride->FormatNameTo(gCommonFormatArgs + nameArgLen);
@ -4989,7 +4989,7 @@ void Guest::UpdateRideLeaveExit()
OnExitRide(current_ride);
if (ride != nullptr && (peep_flags & PEEP_FLAGS_TRACKING))
if (ride != nullptr && (PeepFlags & PEEP_FLAGS_TRACKING))
{
auto nameArgLen = FormatNameTo(gCommonFormatArgs);
ride->FormatNameTo(gCommonFormatArgs + nameArgLen);
@ -5258,7 +5258,7 @@ void Guest::UpdateWalking()
if (!CheckForPath())
return;
if (peep_flags & PEEP_FLAGS_WAVING)
if (PeepFlags & PEEP_FLAGS_WAVING)
{
if (action >= PEEP_ACTION_NONE_1)
{
@ -5273,7 +5273,7 @@ void Guest::UpdateWalking()
}
}
if (peep_flags & PEEP_FLAGS_PHOTO)
if (PeepFlags & PEEP_FLAGS_PHOTO)
{
if (action >= PEEP_ACTION_NONE_1)
{
@ -5288,7 +5288,7 @@ void Guest::UpdateWalking()
}
}
if (peep_flags & PEEP_FLAGS_PAINTING)
if (PeepFlags & PEEP_FLAGS_PAINTING)
{
if (action >= PEEP_ACTION_NONE_1)
{
@ -5303,7 +5303,7 @@ void Guest::UpdateWalking()
}
}
if (peep_flags & PEEP_FLAGS_LITTER)
if (PeepFlags & PEEP_FLAGS_LITTER)
{
if (!GetNextIsSurface())
{
@ -5410,7 +5410,7 @@ void Guest::UpdateWalking()
if (state != PEEP_STATE_WALKING)
return;
if (peep_flags & PEEP_FLAGS_LEAVING_PARK)
if (PeepFlags & PEEP_FLAGS_LEAVING_PARK)
return;
if (nausea > 140)
@ -5988,7 +5988,7 @@ void Guest::UpdateUsingBin()
/* Simplifies 0x690582. Returns true if should find bench*/
bool Guest::ShouldFindBench()
{
if (peep_flags & PEEP_FLAGS_LEAVING_PARK)
if (PeepFlags & PEEP_FLAGS_LEAVING_PARK)
{
return false;
}
@ -6203,7 +6203,7 @@ static void peep_update_walking_break_scenery(Peep* peep)
if (gCheatsDisableVandalism)
return;
if (!(peep->peep_flags & PEEP_FLAGS_ANGRY))
if (!(peep->PeepFlags & PEEP_FLAGS_ANGRY))
{
if (peep->happiness >= 48)
return;
@ -6770,11 +6770,11 @@ void Guest::SetSpriteType(PeepSpriteType new_sprite_type)
if (action >= PEEP_ACTION_NONE_1)
action = PEEP_ACTION_NONE_2;
peep_flags &= ~PEEP_FLAGS_SLOW_WALK;
PeepFlags &= ~PEEP_FLAGS_SLOW_WALK;
Guard::Assert(new_sprite_type < std::size(gSpriteTypeToSlowWalkMap));
if (gSpriteTypeToSlowWalkMap[new_sprite_type])
{
peep_flags |= PEEP_FLAGS_SLOW_WALK;
PeepFlags |= PEEP_FLAGS_SLOW_WALK;
}
action_sprite_type = PEEP_ACTION_SPRITE_TYPE_INVALID;
@ -6944,5 +6944,5 @@ void Guest::UpdateSpriteType()
bool Guest::HeadingForRideOrParkExit() const
{
return (peep_flags & PEEP_FLAGS_LEAVING_PARK) || (guest_heading_to_ride_id != 0xFF);
return (PeepFlags & PEEP_FLAGS_LEAVING_PARK) || (guest_heading_to_ride_id != 0xFF);
}

18
src/openrct2/peep/GuestPathfinding.cpp
View File

@ -442,15 +442,15 @@ static uint8_t peep_pathfind_get_max_number_junctions(Peep* peep)
return 8;
// PEEP_FLAGS_2? It's cleared here but not set anywhere!
if ((peep->peep_flags & PEEP_FLAGS_2))
if ((peep->PeepFlags & PEEP_FLAGS_2))
{
if ((scenario_rand() & 0xFFFF) <= 7281)
peep->peep_flags &= ~PEEP_FLAGS_2;
peep->PeepFlags &= ~PEEP_FLAGS_2;
return 8;
}
if (peep->peep_flags & PEEP_FLAGS_LEAVING_PARK && peep->peep_is_lost_countdown < 90)
if (peep->PeepFlags & PEEP_FLAGS_LEAVING_PARK && peep->peep_is_lost_countdown < 90)
{
return 8;
}
@ -458,7 +458,7 @@ static uint8_t peep_pathfind_get_max_number_junctions(Peep* peep)
if (peep->ItemStandardFlags & PEEP_ITEM_MAP)
return 7;
if (peep->peep_flags & PEEP_FLAGS_LEAVING_PARK)
if (peep->PeepFlags & PEEP_FLAGS_LEAVING_PARK)
return 7;
return 5;
@ -1646,13 +1646,13 @@ static int32_t guest_path_find_leaving_park(Peep* peep, uint8_t edges)
static int32_t guest_path_find_park_entrance(Peep* peep, uint8_t edges)
{
// If entrance no longer exists, choose a new one
if ((peep->peep_flags & PEEP_FLAGS_PARK_ENTRANCE_CHOSEN) && peep->current_ride >= gParkEntrances.size())
if ((peep->PeepFlags & PEEP_FLAGS_PARK_ENTRANCE_CHOSEN) && peep->current_ride >= gParkEntrances.size())
{
peep->current_ride = 0xFF;
peep->peep_flags &= ~(PEEP_FLAGS_PARK_ENTRANCE_CHOSEN);
peep->PeepFlags &= ~(PEEP_FLAGS_PARK_ENTRANCE_CHOSEN);
}
if (!(peep->peep_flags & PEEP_FLAGS_PARK_ENTRANCE_CHOSEN))
if (!(peep->PeepFlags & PEEP_FLAGS_PARK_ENTRANCE_CHOSEN))
{
uint8_t chosenEntrance = 0xFF;
uint16_t nearestDist = 0xFFFF;
@ -1672,7 +1672,7 @@ static int32_t guest_path_find_park_entrance(Peep* peep, uint8_t edges)
return guest_path_find_aimless(peep, edges);
peep->current_ride = chosenEntrance;
peep->peep_flags |= PEEP_FLAGS_PARK_ENTRANCE_CHOSEN;
peep->PeepFlags |= PEEP_FLAGS_PARK_ENTRANCE_CHOSEN;
}
const auto& entrance = gParkEntrances[peep->current_ride];
@ -2041,7 +2041,7 @@ int32_t guest_path_finding(Guest* peep)
}
}
if (peep->peep_flags & PEEP_FLAGS_LEAVING_PARK)
if (peep->PeepFlags & PEEP_FLAGS_LEAVING_PARK)
{
#if defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1
if (gPathFindDebug)

24
src/openrct2/peep/Peep.cpp
View File

@ -1123,7 +1123,7 @@ void Peep::Update()
uint32_t stepsToTake = energy;
if (stepsToTake < 95 && state == PEEP_STATE_QUEUING)
stepsToTake = 95;
if ((peep_flags & PEEP_FLAGS_SLOW_WALK) && state != PEEP_STATE_QUEUING)
if ((PeepFlags & PEEP_FLAGS_SLOW_WALK) && state != PEEP_STATE_QUEUING)
stepsToTake /= 2;
if (action == PEEP_ACTION_NONE_2 && (GetNextIsSloped()))
{
@ -1633,7 +1633,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords)
peep->action_sprite_image_offset = 0;
peep->NoActionFrameNum = 0;
peep->action_sprite_type = PEEP_ACTION_SPRITE_TYPE_NONE;
peep->peep_flags = 0;
peep->PeepFlags = 0;
peep->FavouriteRide = RIDE_ID_NULL;
peep->FavouriteRideRating = 0;
@ -1852,7 +1852,7 @@ void Peep::FormatActionTo(void* argsV) const
}
else
{
ft.Add<rct_string_id>((peep_flags & PEEP_FLAGS_LEAVING_PARK) ? STR_LEAVING_PARK : STR_WALKING);
ft.Add<rct_string_id>((PeepFlags & PEEP_FLAGS_LEAVING_PARK) ? STR_LEAVING_PARK : STR_WALKING);
}
break;
case PEEP_STATE_QUEUING_FRONT:
@ -2228,7 +2228,7 @@ void peep_set_map_tooltip(Peep* peep)
auto ft = Formatter::MapTooltip();
if (peep->type == PEEP_TYPE_GUEST)
{
ft.Add<rct_string_id>((peep->peep_flags & PEEP_FLAGS_TRACKING) ? STR_TRACKED_GUEST_MAP_TIP : STR_GUEST_MAP_TIP);
ft.Add<rct_string_id>((peep->PeepFlags & PEEP_FLAGS_TRACKING) ? STR_TRACKED_GUEST_MAP_TIP : STR_GUEST_MAP_TIP);
ft.Add<uint32_t>(get_peep_face_sprite_small(peep));
peep->FormatNameTo(ft);
peep->FormatActionTo(ft);
@ -2439,7 +2439,7 @@ static void peep_interact_with_entrance(Peep* peep, int16_t x, int16_t y, TileEl
peep->SetState(PEEP_STATE_QUEUING);
peep->sub_state = 11;
peep->time_in_queue = 0;
if (peep->peep_flags & PEEP_FLAGS_TRACKING)
if (peep->PeepFlags & PEEP_FLAGS_TRACKING)
{
auto ft = Formatter::Common();
peep->FormatNameTo(ft);
@ -2484,7 +2484,7 @@ static void peep_interact_with_entrance(Peep* peep, int16_t x, int16_t y, TileEl
return;
}
if (!(peep->peep_flags & PEEP_FLAGS_LEAVING_PARK))
if (!(peep->PeepFlags & PEEP_FLAGS_LEAVING_PARK))
{
// If the park is open and leaving flag isn't set return to centre
if (gParkFlags & PARK_FLAGS_PARK_OPEN)
@ -2501,7 +2501,7 @@ static void peep_interact_with_entrance(Peep* peep, int16_t x, int16_t y, TileEl
peep->SetState(PEEP_STATE_LEAVING_PARK);
peep->var_37 = 0;
if (peep->peep_flags & PEEP_FLAGS_TRACKING)
if (peep->PeepFlags & PEEP_FLAGS_TRACKING)
{
auto ft = Formatter::Common();
peep->FormatNameTo(ft);
@ -2628,7 +2628,7 @@ static void peep_interact_with_entrance(Peep* peep, int16_t x, int16_t y, TileEl
gTotalIncomeFromAdmissions += entranceFee;
guest->SpendMoney(peep->PaidToEnter, entranceFee, ExpenditureType::ParkEntranceTickets);
peep->peep_flags |= PEEP_FLAGS_HAS_PAID_FOR_PARK_ENTRY;
peep->PeepFlags |= PEEP_FLAGS_HAS_PAID_FOR_PARK_ENTRY;
}
gTotalAdmissions++;
@ -2871,7 +2871,7 @@ static void peep_interact_with_path(Peep* peep, int16_t x, int16_t y, TileElemen
peep->sub_state = 10;
peep->destination_tolerance = 2;
peep->time_in_queue = 0;
if (peep->peep_flags & PEEP_FLAGS_TRACKING)
if (peep->PeepFlags & PEEP_FLAGS_TRACKING)
{
auto ft = Formatter::Common();
peep->FormatNameTo(ft);
@ -2943,7 +2943,7 @@ static bool peep_interact_with_shop(Peep* peep, int16_t x, int16_t y, TileElemen
return true;
}
if (peep->peep_flags & PEEP_FLAGS_LEAVING_PARK)
if (peep->PeepFlags & PEEP_FLAGS_LEAVING_PARK)
{
peep_return_to_centre_of_tile(peep);
return true;
@ -2978,7 +2978,7 @@ static bool peep_interact_with_shop(Peep* peep, int16_t x, int16_t y, TileElemen
peep->TimeOnRide = 0;
ride->cur_num_customers++;
if (peep->peep_flags & PEEP_FLAGS_TRACKING)
if (peep->PeepFlags & PEEP_FLAGS_TRACKING)
{
auto ft = Formatter::Common();
peep->FormatNameTo(ft);
@ -3322,7 +3322,7 @@ void pathfind_logging_enable([[maybe_unused]] Peep* peep)
* be output for. */
if (peep->type == PEEP_TYPE_GUEST)
{
gPathFindDebug = peep->peep_flags & PEEP_FLAGS_TRACKING;
gPathFindDebug = peep->PeepFlags & PEEP_FLAGS_TRACKING;
}
/* For staff, there is no tracking button (any other similar
* suitable existing mechanism?), so fall back to a crude

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

@ -697,7 +697,7 @@ struct Peep : SpriteBase
uint8_t peep_is_lost_countdown;
};
uint8_t photo1_ride_ref;
uint32_t peep_flags;
uint32_t PeepFlags;
rct12_xyzd8 PathfindGoal;
rct12_xyzd8 PathfindHistory[4];
uint8_t NoActionFrameNum;

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

@ -1860,10 +1860,10 @@ void Staff::Tick128UpdateStaff()
if (action < PEEP_ACTION_NONE_1)
action = PEEP_ACTION_NONE_2;
peep_flags &= ~PEEP_FLAGS_SLOW_WALK;
PeepFlags &= ~PEEP_FLAGS_SLOW_WALK;
if (gSpriteTypeToSlowWalkMap[newSpriteType])
{
peep_flags |= PEEP_FLAGS_SLOW_WALK;
PeepFlags |= PEEP_FLAGS_SLOW_WALK;
}
action_sprite_type = PEEP_ACTION_SPRITE_TYPE_INVALID;

2
src/openrct2/rct1/S4Importer.cpp
View File

@ -1532,7 +1532,7 @@ private:
// The ID is fixed later
dst->next_in_queue = src->next_in_queue;
dst->peep_flags = 0;
dst->PeepFlags = 0;
dst->PathfindGoal.x = 0xFF;
dst->PathfindGoal.y = 0xFF;
dst->PathfindGoal.z = 0xFF;

2
src/openrct2/rct2/S6Exporter.cpp
View File

@ -1211,7 +1211,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
dst->guest_heading_to_ride_id = src->guest_heading_to_ride_id;
dst->peep_is_lost_countdown = src->peep_is_lost_countdown;
dst->photo1_ride_ref = src->photo1_ride_ref;
dst->peep_flags = src->peep_flags;
dst->peep_flags = src->PeepFlags;
dst->pathfind_goal = src->PathfindGoal;
for (size_t i = 0; i < std::size(src->PathfindHistory); i++)
{

2
src/openrct2/rct2/S6Importer.cpp
View File

@ -1476,7 +1476,7 @@ public:
dst->guest_heading_to_ride_id = src->guest_heading_to_ride_id;
dst->peep_is_lost_countdown = src->peep_is_lost_countdown;
dst->photo1_ride_ref = src->photo1_ride_ref;
dst->peep_flags = src->peep_flags;
dst->PeepFlags = src->peep_flags;
dst->PathfindGoal = src->pathfind_goal;
for (size_t i = 0; i < std::size(src->pathfind_history); i++)
{

2
src/openrct2/ride/Vehicle.cpp
View File

@ -3048,7 +3048,7 @@ void Vehicle::PeepEasterEggHereWeAre() const
for (int32_t i = 0; i < vehicle->num_peeps; ++i)
{
Peep* curPeep = GET_PEEP(vehicle->peep[i]);
if (curPeep->peep_flags & PEEP_FLAGS_HERE_WE_ARE)
if (curPeep->PeepFlags & PEEP_FLAGS_HERE_WE_ARE)
{
curPeep->InsertNewThought(PEEP_THOUGHT_TYPE_HERE_WE_ARE, curPeep->current_ride);
}

6
src/openrct2/scripting/ScEntity.hpp
View File

@ -256,7 +256,7 @@ namespace OpenRCT2::Scripting
if (peep != nullptr)
{
auto mask = PeepFlagMap[key];
return (peep->peep_flags & mask) != 0;
return (peep->PeepFlags & mask) != 0;
}
return false;
}
@ -269,9 +269,9 @@ namespace OpenRCT2::Scripting
{
auto mask = PeepFlagMap[key];
if (value)
peep->peep_flags |= mask;
peep->PeepFlags |= mask;
else
peep->peep_flags &= ~mask;
peep->PeepFlags &= ~mask;
peep->Invalidate();
}
}

2
src/openrct2/world/Park.cpp
View File

@ -395,7 +395,7 @@ int32_t Park::CalculateParkRating() const
{
happyGuestCount++;
}
if ((peep->peep_flags & PEEP_FLAGS_LEAVING_PARK) && (peep->peep_is_lost_countdown < 90))
if ((peep->PeepFlags & PEEP_FLAGS_LEAVING_PARK) && (peep->peep_is_lost_countdown < 90))
{
lostGuestCount++;
}

2
test/tests/S6ImportExportTests.cpp
View File

@ -231,7 +231,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(guest_heading_to_ride_id);
COMPARE_FIELD(staff_orders);
COMPARE_FIELD(photo1_ride_ref);
COMPARE_FIELD(peep_flags);
COMPARE_FIELD(PeepFlags);
COMPARE_FIELD(PathfindGoal.x);
COMPARE_FIELD(PathfindGoal.y);
COMPARE_FIELD(PathfindGoal.z);