1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00

Rename Peep::time_lost to TimeLost

This commit is contained in:
Tulio Leao
2020-05-13 23:22:08 -03:00
parent a216cb9930
commit 589a7a48be
8 changed files with 15 additions and 15 deletions

View File

@@ -306,7 +306,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, voucher_arguments); COMPARE_FIELD(Peep, voucher_arguments);
COMPARE_FIELD(Peep, surroundings_thought_timeout); COMPARE_FIELD(Peep, surroundings_thought_timeout);
COMPARE_FIELD(Peep, angriness); COMPARE_FIELD(Peep, angriness);
COMPARE_FIELD(Peep, time_lost); COMPARE_FIELD(Peep, TimeLost);
COMPARE_FIELD(Peep, DaysInQueue); COMPARE_FIELD(Peep, DaysInQueue);
COMPARE_FIELD(Peep, BalloonColour); COMPARE_FIELD(Peep, BalloonColour);
COMPARE_FIELD(Peep, UmbrellaColour); COMPARE_FIELD(Peep, UmbrellaColour);

View File

@@ -1399,10 +1399,10 @@ void Guest::CheckIfLost()
if (!(peep_flags & PEEP_FLAGS_21)) if (!(peep_flags & PEEP_FLAGS_21))
return; return;
time_lost++; TimeLost++;
if (time_lost != 254) if (TimeLost != 254)
return; return;
time_lost = 230; TimeLost = 230;
} }
InsertNewThought(PEEP_THOUGHT_TYPE_LOST, PEEP_THOUGHT_ITEM_NONE); InsertNewThought(PEEP_THOUGHT_TYPE_LOST, PEEP_THOUGHT_ITEM_NONE);
@@ -3245,7 +3245,7 @@ template<typename T> static void peep_head_for_nearest_ride(Guest* peep, bool co
peep->peep_is_lost_countdown = 200; peep->peep_is_lost_countdown = 200;
peep_reset_pathfind_goal(peep); peep_reset_pathfind_goal(peep);
peep->window_invalidate_flags |= PEEP_INVALIDATE_PEEP_ACTION; peep->window_invalidate_flags |= PEEP_INVALIDATE_PEEP_ACTION;
peep->time_lost = 0; peep->TimeLost = 0;
} }
} }

View File

@@ -1774,7 +1774,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords)
peep->no_of_souvenirs = 0; peep->no_of_souvenirs = 0;
peep->surroundings_thought_timeout = 0; peep->surroundings_thought_timeout = 0;
peep->angriness = 0; peep->angriness = 0;
peep->time_lost = 0; peep->TimeLost = 0;
uint8_t tshirtColour = static_cast<uint8_t>(scenario_rand() % std::size(tshirt_colours)); uint8_t tshirtColour = static_cast<uint8_t>(scenario_rand() % std::size(tshirt_colours));
peep->tshirt_colour = tshirt_colours[tshirtColour]; peep->tshirt_colour = tshirt_colours[tshirtColour];
@@ -2410,7 +2410,7 @@ static void peep_interact_with_entrance(Peep* peep, int16_t x, int16_t y, TileEl
return; return;
} }
peep->time_lost = 0; peep->TimeLost = 0;
auto stationNum = tile_element->AsEntrance()->GetStationIndex(); auto stationNum = tile_element->AsEntrance()->GetStationIndex();
// Guest walks up to the ride for the first time since entering // Guest walks up to the ride for the first time since entering
// the path tile or since considering another ride attached to // the path tile or since considering another ride attached to
@@ -2839,7 +2839,7 @@ static void peep_interact_with_path(Peep* peep, int16_t x, int16_t y, TileElemen
else else
{ {
// Peep is not queuing. // Peep is not queuing.
peep->time_lost = 0; peep->TimeLost = 0;
auto stationNum = tile_element->AsPath()->GetStationIndex(); auto stationNum = tile_element->AsPath()->GetStationIndex();
if ((tile_element->AsPath()->HasQueueBanner()) if ((tile_element->AsPath()->HasQueueBanner())
@@ -2929,7 +2929,7 @@ static bool peep_interact_with_shop(Peep* peep, int16_t x, int16_t y, TileElemen
return true; return true;
} }
peep->time_lost = 0; peep->TimeLost = 0;
if (ride->status != RIDE_STATUS_OPEN) if (ride->status != RIDE_STATUS_OPEN)
{ {
@@ -2951,7 +2951,7 @@ static bool peep_interact_with_shop(Peep* peep, int16_t x, int16_t y, TileElemen
if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_PEEP_SHOULD_GO_INSIDE_FACILITY)) if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_PEEP_SHOULD_GO_INSIDE_FACILITY))
{ {
peep->time_lost = 0; peep->TimeLost = 0;
if (!guest->ShouldGoOnRide(ride, 0, false, false)) if (!guest->ShouldGoOnRide(ride, 0, false, false))
{ {
peep_return_to_centre_of_tile(peep); peep_return_to_centre_of_tile(peep);

View File

@@ -740,7 +740,7 @@ struct Peep : SpriteBase
uint8_t voucher_arguments; // ride_id or string_offset_id uint8_t voucher_arguments; // ride_id or string_offset_id
uint8_t surroundings_thought_timeout; uint8_t surroundings_thought_timeout;
uint8_t angriness; uint8_t angriness;
uint8_t time_lost; // the time the peep has been lost when it reaches 254 generates the lost thought uint8_t TimeLost; // the time the peep has been lost when it reaches 254 generates the lost thought
uint8_t DaysInQueue; uint8_t DaysInQueue;
uint8_t BalloonColour; uint8_t BalloonColour;
uint8_t UmbrellaColour; uint8_t UmbrellaColour;

View File

@@ -1499,7 +1499,7 @@ private:
dst->surroundings_thought_timeout = src->surroundings_thought_timeout; dst->surroundings_thought_timeout = src->surroundings_thought_timeout;
dst->angriness = src->angriness; dst->angriness = src->angriness;
dst->time_lost = src->time_lost; dst->TimeLost = src->time_lost;
for (size_t i = 0; i < 32; i++) for (size_t i = 0; i < 32; i++)
{ {

View File

@@ -1233,7 +1233,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
dst->voucher_arguments = src->voucher_arguments; dst->voucher_arguments = src->voucher_arguments;
dst->surroundings_thought_timeout = src->surroundings_thought_timeout; dst->surroundings_thought_timeout = src->surroundings_thought_timeout;
dst->angriness = src->angriness; dst->angriness = src->angriness;
dst->time_lost = src->time_lost; dst->time_lost = src->TimeLost;
dst->days_in_queue = src->DaysInQueue; dst->days_in_queue = src->DaysInQueue;
dst->balloon_colour = src->BalloonColour; dst->balloon_colour = src->BalloonColour;
dst->umbrella_colour = src->UmbrellaColour; dst->umbrella_colour = src->UmbrellaColour;

View File

@@ -1498,7 +1498,7 @@ public:
dst->voucher_arguments = src->voucher_arguments; dst->voucher_arguments = src->voucher_arguments;
dst->surroundings_thought_timeout = src->surroundings_thought_timeout; dst->surroundings_thought_timeout = src->surroundings_thought_timeout;
dst->angriness = src->angriness; dst->angriness = src->angriness;
dst->time_lost = src->time_lost; dst->TimeLost = src->time_lost;
dst->DaysInQueue = src->days_in_queue; dst->DaysInQueue = src->days_in_queue;
dst->BalloonColour = src->balloon_colour; dst->BalloonColour = src->balloon_colour;
dst->UmbrellaColour = src->umbrella_colour; dst->UmbrellaColour = src->umbrella_colour;

View File

@@ -259,7 +259,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(voucher_arguments); COMPARE_FIELD(voucher_arguments);
COMPARE_FIELD(surroundings_thought_timeout); COMPARE_FIELD(surroundings_thought_timeout);
COMPARE_FIELD(angriness); COMPARE_FIELD(angriness);
COMPARE_FIELD(time_lost); COMPARE_FIELD(TimeLost);
COMPARE_FIELD(DaysInQueue); COMPARE_FIELD(DaysInQueue);
COMPARE_FIELD(BalloonColour); COMPARE_FIELD(BalloonColour);
COMPARE_FIELD(UmbrellaColour); COMPARE_FIELD(UmbrellaColour);