From 8400a7f54d03d6db3b6e855f65bae42e345d1395 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Sat, 6 Jun 2020 10:54:40 -0300 Subject: [PATCH] Rename Peep::time_in_queue to TimeInQueue --- src/openrct2/GameStateSnapshots.cpp | 2 +- src/openrct2/peep/Guest.cpp | 18 +++++++++--------- src/openrct2/peep/Peep.cpp | 6 +++--- src/openrct2/peep/Peep.h | 2 +- src/openrct2/peep/Staff.cpp | 6 +++--- src/openrct2/rct2/S6Exporter.cpp | 2 +- src/openrct2/rct2/S6Importer.cpp | 2 +- test/tests/S6ImportExportTests.cpp | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 955a17bb23..d74b103a4f 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -264,7 +264,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots COMPARE_FIELD(Peep, next_in_queue); COMPARE_FIELD(Peep, maze_last_edge); COMPARE_FIELD(Peep, interaction_ride_index); - COMPARE_FIELD(Peep, time_in_queue); + COMPARE_FIELD(Peep, TimeInQueue); for (int i = 0; i < 32; i++) { COMPARE_FIELD(Peep, RidesBeenOn[i]); diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index 4e8e264484..a3cfdccf10 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -952,7 +952,7 @@ void Guest::Tick128UpdateGuest(int32_t index) break; case PEEP_STATE_QUEUING: - if (time_in_queue >= 2000) + if (TimeInQueue >= 2000) { /* Peep happiness is affected once the peep has been waiting * too long in a queue. */ @@ -2029,7 +2029,7 @@ bool Guest::ShouldGoOnRide(Ride* ride, int32_t entranceNum, bool atQueue, bool t } // This checks if there's a peep standing still at the very end of the queue. - if (maxD <= 13 && lastPeepInQueue->time_in_queue > 10) + if (maxD <= 13 && lastPeepInQueue->TimeInQueue > 10) { peep_tried_to_enter_full_queue(this, ride); return false; @@ -2680,11 +2680,11 @@ static int16_t peep_calculate_ride_satisfaction(Guest* peep, Ride* ride) // Calculate satisfaction based on how long the peep has been in the queue for. // (For comparison: peeps start thinking "I've been queueing for a long time" at 3500 and // start leaving the queue at 4300.) - if (peep->time_in_queue >= 4500) + if (peep->TimeInQueue >= 4500) satisfaction -= 35; - else if (peep->time_in_queue >= 2250) + else if (peep->TimeInQueue >= 2250) satisfaction -= 10; - else if (peep->time_in_queue <= 750) + else if (peep->TimeInQueue <= 750) satisfaction += 10; // Peeps get a small boost in satisfaction if they've been on a ride of the same type before, @@ -5588,7 +5588,7 @@ void Guest::UpdateQueuing() return; if (sprite_type == PEEP_SPRITE_TYPE_NORMAL) { - if (time_in_queue >= 2000 && (0xFFFF & scenario_rand()) <= 119) + if (TimeInQueue >= 2000 && (0xFFFF & scenario_rand()) <= 119) { // Eat Food/Look at watch action = PEEP_ACTION_EAT_FOOD; @@ -5596,7 +5596,7 @@ void Guest::UpdateQueuing() action_sprite_image_offset = 0; UpdateCurrentActionSpriteType(); } - if (time_in_queue >= 3500 && (0xFFFF & scenario_rand()) <= 93) + if (TimeInQueue >= 3500 && (0xFFFF & scenario_rand()) <= 93) { // Create the I have been waiting in line ages thought InsertNewThought(PEEP_THOUGHT_TYPE_QUEUING_AGES, current_ride); @@ -5604,7 +5604,7 @@ void Guest::UpdateQueuing() } else { - if (!(time_in_queue & 0x3F) && action == PEEP_ACTION_NONE_1 && next_action_sprite_type == 2) + if (!(TimeInQueue & 0x3F) && action == PEEP_ACTION_NONE_1 && next_action_sprite_type == 2) { switch (sprite_type) { @@ -5641,7 +5641,7 @@ void Guest::UpdateQueuing() } } } - if (time_in_queue < 4300) + if (TimeInQueue < 4300) return; if (happiness <= 65 && (0xFFFF & scenario_rand()) < 2184) diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index da73a8b73e..5a95f71ca5 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -2265,7 +2265,7 @@ void Peep::SwitchNextActionSpriteType() */ static bool peep_update_queue_position(Peep* peep, uint8_t previous_action) { - peep->time_in_queue++; + peep->TimeInQueue++; if (peep->next_in_queue == SPRITE_INDEX_NULL) return false; @@ -2438,7 +2438,7 @@ static void peep_interact_with_entrance(Peep* peep, int16_t x, int16_t y, TileEl peep->DaysInQueue = 0; peep->SetState(PEEP_STATE_QUEUING); peep->sub_state = 11; - peep->time_in_queue = 0; + peep->TimeInQueue = 0; if (peep->PeepFlags & PEEP_FLAGS_TRACKING) { auto ft = Formatter::Common(); @@ -2870,7 +2870,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; + peep->TimeInQueue = 0; if (peep->PeepFlags & PEEP_FLAGS_TRACKING) { auto ft = Formatter::Common(); diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index 413d23cb79..8576638a6f 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -673,7 +673,7 @@ struct Peep : SpriteBase Direction direction; // Direction ? }; uint8_t interaction_ride_index; - uint16_t time_in_queue; + uint16_t TimeInQueue; uint8_t RidesBeenOn[32]; // 255 bit bitmap of every ride the peep has been on see // window_peep_rides_update for how to use. diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index 4539081333..9f6316229a 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -1045,13 +1045,13 @@ static void staff_entertainer_update_nearby_peeps(Peep* peep) } else if (peep->state == PEEP_STATE_QUEUING) { - if (peep->time_in_queue > 200) + if (peep->TimeInQueue > 200) { - peep->time_in_queue -= 200; + peep->TimeInQueue -= 200; } else { - peep->time_in_queue = 0; + peep->TimeInQueue = 0; } peep->happiness_target = std::min(peep->happiness_target + 3, PEEP_MAX_HAPPINESS); } diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index dab4c229d2..9de9eee4cc 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -1186,7 +1186,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src) dst->next_in_queue = src->next_in_queue; dst->direction = src->direction; dst->interaction_ride_index = src->interaction_ride_index; - dst->time_in_queue = src->time_in_queue; + dst->time_in_queue = src->TimeInQueue; for (size_t i = 0; i < std::size(src->RidesBeenOn); i++) { dst->rides_been_on[i] = src->RidesBeenOn[i]; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 48e723b2f5..69b71f861f 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1451,7 +1451,7 @@ public: dst->next_in_queue = src->next_in_queue; dst->direction = src->direction; dst->interaction_ride_index = src->interaction_ride_index; - dst->time_in_queue = src->time_in_queue; + dst->TimeInQueue = src->time_in_queue; for (size_t i = 0; i < std::size(src->rides_been_on); i++) { dst->RidesBeenOn[i] = src->rides_been_on[i]; diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index 3258b98d8c..72c04b2ec7 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -208,7 +208,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right) COMPARE_FIELD(next_in_queue); COMPARE_FIELD(maze_last_edge); COMPARE_FIELD(interaction_ride_index); - COMPARE_FIELD(time_in_queue); + COMPARE_FIELD(TimeInQueue); for (int i = 0; i < 32; i++) { COMPARE_FIELD(RidesBeenOn[i]);