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

Adjust InsertThought overloads to use correct constants

This commit is contained in:
ζeh Matt 2021-08-30 19:42:23 +03:00
parent e9c959b187
commit 336372c7be
No known key found for this signature in database
GPG Key ID: 18CE582C71A225B0
4 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1100,7 +1100,7 @@ void window_guest_overview_update(rct_window* w)
int32_t random = util_rand() & 0xFFFF;
if (random <= 0x2AAA)
{
peep->InsertNewThought(PeepThoughtType::Watched, PEEP_THOUGHT_ITEM_NONE);
peep->InsertNewThought(PeepThoughtType::Watched);
}
}
}

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

@ -889,7 +889,7 @@ void Guest::Tick128UpdateGuest(int32_t index)
PeepThoughtType thought_type = crowded_thoughts[scenario_rand() & 0xF];
if (thought_type != PeepThoughtType::None)
{
InsertNewThought(thought_type, PEEP_THOUGHT_ITEM_NONE);
InsertNewThought(thought_type);
}
}
@ -950,7 +950,7 @@ void Guest::Tick128UpdateGuest(int32_t index)
if (thought_type != PeepThoughtType::None)
{
InsertNewThought(thought_type, PEEP_THOUGHT_ITEM_NONE);
InsertNewThought(thought_type);
HappinessTarget = std::min(PEEP_MAX_HAPPINESS, HappinessTarget + 45);
}
}
@ -965,7 +965,7 @@ void Guest::Tick128UpdateGuest(int32_t index)
if (PeepFlags & PEEP_FLAGS_WOW)
{
InsertNewThought(PeepThoughtType::Wow2, PEEP_THOUGHT_ITEM_NONE);
InsertNewThought(PeepThoughtType::Wow2);
}
if (GuestTimeOnRide > 15)
@ -1070,7 +1070,7 @@ void Guest::Tick128UpdateGuest(int32_t index)
{
PeepThoughtType chosen_thought = possible_thoughts[scenario_rand() % num_thoughts];
InsertNewThought(chosen_thought, PEEP_THOUGHT_ITEM_NONE);
InsertNewThought(chosen_thought);
switch (chosen_thought)
{
@ -1106,7 +1106,7 @@ void Guest::Tick128UpdateGuest(int32_t index)
thought_type = PeepThoughtType::VerySick;
peep_head_for_nearest_ride_type(this, RIDE_TYPE_FIRST_AID);
}
InsertNewThought(thought_type, PEEP_THOUGHT_ITEM_NONE);
InsertNewThought(thought_type);
}
}
@ -1379,7 +1379,7 @@ void Guest::CheckIfLost()
return;
TimeLost = 230;
}
InsertNewThought(PeepThoughtType::Lost, PEEP_THOUGHT_ITEM_NONE);
InsertNewThought(PeepThoughtType::Lost);
HappinessTarget = std::max(HappinessTarget - 30, 0);
}
@ -1429,7 +1429,7 @@ void Guest::CheckCantFindExit()
// Peeps who can't find the park exit will continue to get less happy until they find it.
if (GuestIsLostCountdown == 1)
{
InsertNewThought(PeepThoughtType::CantFindExit, PEEP_THOUGHT_ITEM_NONE);
InsertNewThought(PeepThoughtType::CantFindExit);
HappinessTarget = std::max(HappinessTarget - 30, 0);
}
@ -1495,13 +1495,13 @@ bool Guest::DecideAndBuyItem(Ride* ride, ShopItem shopItem, money32 price)
if (GetShopItemDescriptor(shopItem).IsFood() && (Hunger > 75))
{
InsertNewThought(PeepThoughtType::NotHungry, PEEP_THOUGHT_ITEM_NONE);
InsertNewThought(PeepThoughtType::NotHungry);
return false;
}
if (GetShopItemDescriptor(shopItem).IsDrink() && (Thirst > 75))
{
InsertNewThought(PeepThoughtType::NotThirsty, PEEP_THOUGHT_ITEM_NONE);
InsertNewThought(PeepThoughtType::NotThirsty);
return false;
}
@ -1517,7 +1517,7 @@ bool Guest::DecideAndBuyItem(Ride* ride, ShopItem shopItem, money32 price)
{
if (CashInPocket == 0)
{
InsertNewThought(PeepThoughtType::SpentMoney, PEEP_THOUGHT_ITEM_NONE);
InsertNewThought(PeepThoughtType::SpentMoney);
return false;
}
if (price > CashInPocket)
@ -1991,7 +1991,7 @@ bool Guest::ShouldGoOnRide(Ride* ride, int32_t entranceNum, bool atQueue, bool t
{
if (CashInPocket <= 0)
{
InsertNewThought(PeepThoughtType::SpentMoney, PEEP_THOUGHT_ITEM_NONE);
InsertNewThought(PeepThoughtType::SpentMoney);
}
else
{
@ -2235,7 +2235,7 @@ bool Guest::ShouldGoToShop(Ride* ride, bool peepAtShop)
{
if (CashInPocket <= 0)
{
InsertNewThought(PeepThoughtType::SpentMoney, PEEP_THOUGHT_ITEM_NONE);
InsertNewThought(PeepThoughtType::SpentMoney);
}
else
{
@ -2584,7 +2584,7 @@ static bool peep_check_ride_price_at_entrance(Guest* peep, Ride* ride, money32 r
if (peep->CashInPocket <= 0 && !(gParkFlags & PARK_FLAGS_NO_MONEY))
{
peep->InsertNewThought(PeepThoughtType::SpentMoney, PEEP_THOUGHT_ITEM_NONE);
peep->InsertNewThought(PeepThoughtType::SpentMoney);
peep_update_ride_at_entrance_try_leave(peep);
return false;
}
@ -3070,7 +3070,7 @@ static void peep_leave_park(Guest* peep)
peep->PeepFlags &= ~PEEP_FLAGS_PARK_ENTRANCE_CHOSEN;
}
peep->InsertNewThought(PeepThoughtType::GoHome, PEEP_THOUGHT_ITEM_NONE);
peep->InsertNewThought(PeepThoughtType::GoHome);
rct_window* w = window_find_by_number(WC_PEEP, peep->sprite_index);
if (w != nullptr)
@ -5425,11 +5425,11 @@ void Guest::UpdateWalking()
if (CurrentSeat & 1)
{
InsertNewThought(PeepThoughtType::NewRide, PEEP_THOUGHT_ITEM_NONE);
InsertNewThought(PeepThoughtType::NewRide);
}
if (CurrentRide == RIDE_ID_NULL)
{
InsertNewThought(PeepThoughtType::Scenery, PEEP_THOUGHT_ITEM_NONE);
InsertNewThought(PeepThoughtType::Scenery);
}
}
@ -6801,6 +6801,16 @@ void peep_thought_set_format_args(const PeepThought* thought, Formatter& ft)
}
}
void Guest::InsertNewThought(PeepThoughtType thought_type)
{
InsertNewThought(thought_type, PeepThoughtItemNone);
}
void Guest::InsertNewThought(PeepThoughtType thought_type, ShopItem shopItem)
{
InsertNewThought(thought_type, static_cast<uint16_t>(shopItem));
}
/**
*
* rct2: 0x699F5A
@ -6808,7 +6818,7 @@ void peep_thought_set_format_args(const PeepThought* thought, Formatter& ft)
* ah:thoughtArguments
* esi: peep
*/
void Guest::InsertNewThought(PeepThoughtType thoughtType, uint8_t thoughtArguments)
void Guest::InsertNewThought(PeepThoughtType thoughtType, uint16_t thoughtArguments)
{
PeepActionType newAction = PeepThoughtToActionMap[EnumValue(thoughtType)].action;
if (newAction != PeepActionType::Walking && IsActionInterruptable())
@ -7459,6 +7469,6 @@ void Guest::RemoveRideFromMemory(ride_id_t rideId)
// Last slot is now free.
auto& lastEntry = Thoughts.back();
lastEntry.type = PeepThoughtType::None;
lastEntry.item = PEEP_THOUGHT_ITEM_NONE;
lastEntry.item = PeepThoughtItemNone;
}
}

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

@ -752,7 +752,7 @@ void Peep::UpdateFalling()
{
// Drop balloon if held
peep_release_balloon(guest, height);
guest->InsertNewThought(PeepThoughtType::Drowning, PEEP_THOUGHT_ITEM_NONE);
guest->InsertNewThought(PeepThoughtType::Drowning);
}
Action = PeepActionType::Drowning;
@ -844,7 +844,7 @@ void Peep::UpdatePicked()
auto* guest = As<Guest>();
if (SubState == 13 && guest != nullptr)
{
guest->InsertNewThought(PeepThoughtType::Help, PEEP_THOUGHT_ITEM_NONE);
guest->InsertNewThought(PeepThoughtType::Help);
}
}
@ -1934,7 +1934,7 @@ static void peep_footpath_move_forward(Peep* peep, const CoordsXYE& coords, bool
{
if ((scenario_rand() & 0xFFFF) <= 10922)
{
guest->InsertNewThought(PeepThoughtType::Vandalism, PEEP_THOUGHT_ITEM_NONE);
guest->InsertNewThought(PeepThoughtType::Vandalism);
guest->HappinessTarget = std::max(0, guest->HappinessTarget - 17);
}
vandalThoughtTimeout = 3;
@ -1979,7 +1979,7 @@ static void peep_footpath_move_forward(Peep* peep, const CoordsXYE& coords, bool
if (crowded >= 10 && guest->State == PeepState::Walking && (scenario_rand() & 0xFFFF) <= 21845)
{
guest->InsertNewThought(PeepThoughtType::Crowded, PEEP_THOUGHT_ITEM_NONE);
guest->InsertNewThought(PeepThoughtType::Crowded);
guest->HappinessTarget = std::max(0, guest->HappinessTarget - 14);
}
@ -2005,7 +2005,7 @@ static void peep_footpath_move_forward(Peep* peep, const CoordsXYE& coords, bool
if (total_sick >= 3 && (scenario_rand() & 0xFFFF) <= 10922)
{
guest->InsertNewThought(PeepThoughtType::PathDisgusting, PEEP_THOUGHT_ITEM_NONE);
guest->InsertNewThought(PeepThoughtType::PathDisgusting);
guest->HappinessTarget = std::max(0, guest->HappinessTarget - 17);
// Reset disgusting time
guest->DisgustingCount |= 0xC0;
@ -2031,7 +2031,7 @@ static void peep_footpath_move_forward(Peep* peep, const CoordsXYE& coords, bool
if (total_litter >= 3 && (scenario_rand() & 0xFFFF) <= 10922)
{
guest->InsertNewThought(PeepThoughtType::BadLitter, PEEP_THOUGHT_ITEM_NONE);
guest->InsertNewThought(PeepThoughtType::BadLitter);
guest->HappinessTarget = std::max(0, guest->HappinessTarget - 17);
// Reset litter time
guest->LitterCount |= 0xC0;

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

@ -773,7 +773,9 @@ public:
void HandleEasterEggName();
int32_t GetEasterEggNameId() const;
void UpdateEasterEggInteractions();
void InsertNewThought(PeepThoughtType thought_type, uint8_t thought_arguments);
void InsertNewThought(PeepThoughtType thought_type);
void InsertNewThought(PeepThoughtType thought_type, ShopItem thought_arguments);
void InsertNewThought(PeepThoughtType thought_type, uint16_t thought_arguments);
static Guest* Generate(const CoordsXYZ& coords);
bool UpdateQueuePosition(PeepActionType previous_action);
void RemoveFromQueue();