From 32c8e5614fb6aa67cf580af201e1a5db38999c38 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Wed, 13 May 2020 23:25:09 -0300 Subject: [PATCH] Rename Peep::angriness to Angriness --- src/openrct2/GameStateSnapshots.cpp | 2 +- src/openrct2/actions/SetCheatAction.hpp | 2 +- src/openrct2/peep/Guest.cpp | 6 +++--- src/openrct2/peep/Peep.cpp | 4 ++-- src/openrct2/peep/Peep.h | 2 +- src/openrct2/rct1/S4Importer.cpp | 2 +- src/openrct2/rct2/S6Exporter.cpp | 2 +- src/openrct2/rct2/S6Importer.cpp | 2 +- test/tests/S6ImportExportTests.cpp | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 94651026de..66935c1448 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -305,7 +305,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots COMPARE_FIELD(Peep, voucher_type); COMPARE_FIELD(Peep, voucher_arguments); COMPARE_FIELD(Peep, surroundings_thought_timeout); - COMPARE_FIELD(Peep, angriness); + COMPARE_FIELD(Peep, Angriness); COMPARE_FIELD(Peep, TimeLost); COMPARE_FIELD(Peep, DaysInQueue); COMPARE_FIELD(Peep, BalloonColour); diff --git a/src/openrct2/actions/SetCheatAction.hpp b/src/openrct2/actions/SetCheatAction.hpp index 9fb9d84815..474da7a9a5 100644 --- a/src/openrct2/actions/SetCheatAction.hpp +++ b/src/openrct2/actions/SetCheatAction.hpp @@ -588,7 +588,7 @@ private: if (value > 0) { peep->peep_flags &= ~PEEP_FLAGS_ANGRY; - peep->angriness = 0; + peep->Angriness = 0; } break; case GUEST_PARAMETER_ENERGY: diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index 4af5e5c388..16f0680077 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -750,8 +750,8 @@ void Guest::Tick128UpdateGuest(int32_t index) nausea = 130; } - if (angriness != 0) - angriness--; + if (Angriness != 0) + Angriness--; if (state == PEEP_STATE_WALKING || state == PEEP_STATE_SITTING) { @@ -6292,7 +6292,7 @@ static void peep_update_walking_break_scenery(Peep* peep) map_invalidate_tile_zoom1({ peep->NextLoc, tileElement->GetBaseZ(), tileElement->GetBaseZ() + 32 }); - peep->angriness = 16; + peep->Angriness = 16; } /** diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 535eb680a0..f20a25d338 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -1773,7 +1773,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords) peep->no_of_drinks = 0; peep->no_of_souvenirs = 0; peep->surroundings_thought_timeout = 0; - peep->angriness = 0; + peep->Angriness = 0; peep->TimeLost = 0; uint8_t tshirtColour = static_cast(scenario_rand() % std::size(tshirt_colours)); @@ -2172,7 +2172,7 @@ static constexpr const int32_t face_sprite_large[] = { static int32_t get_face_sprite_offset(Peep* peep) { // ANGRY - if (peep->angriness > 0) + if (peep->Angriness > 0) return PEEP_FACE_OFFSET_ANGRY; // VERY_VERY_SICK diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index edc6385aa8..ee69c0d032 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -739,7 +739,7 @@ struct Peep : SpriteBase uint8_t voucher_type; uint8_t voucher_arguments; // ride_id or string_offset_id uint8_t surroundings_thought_timeout; - uint8_t angriness; + uint8_t Angriness; uint8_t TimeLost; // the time the peep has been lost when it reaches 254 generates the lost thought uint8_t DaysInQueue; uint8_t BalloonColour; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 80ecc97401..c6d3659b99 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1498,7 +1498,7 @@ private: dst->voucher_type = src->voucher_type; dst->surroundings_thought_timeout = src->surroundings_thought_timeout; - dst->angriness = src->angriness; + dst->Angriness = src->angriness; dst->TimeLost = src->time_lost; for (size_t i = 0; i < 32; i++) diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 7a95091431..34e49e276a 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -1232,7 +1232,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src) dst->voucher_type = src->voucher_type; dst->voucher_arguments = src->voucher_arguments; dst->surroundings_thought_timeout = src->surroundings_thought_timeout; - dst->angriness = src->angriness; + dst->angriness = src->Angriness; dst->time_lost = src->TimeLost; dst->days_in_queue = src->DaysInQueue; dst->balloon_colour = src->BalloonColour; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 32b88be66b..a7969e3a68 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1497,7 +1497,7 @@ public: dst->voucher_type = src->voucher_type; dst->voucher_arguments = src->voucher_arguments; dst->surroundings_thought_timeout = src->surroundings_thought_timeout; - dst->angriness = src->angriness; + dst->Angriness = src->angriness; dst->TimeLost = src->time_lost; dst->DaysInQueue = src->days_in_queue; dst->BalloonColour = src->balloon_colour; diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index a832a0dca5..6a2105c42e 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -258,7 +258,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right) COMPARE_FIELD(voucher_type); COMPARE_FIELD(voucher_arguments); COMPARE_FIELD(surroundings_thought_timeout); - COMPARE_FIELD(angriness); + COMPARE_FIELD(Angriness); COMPARE_FIELD(TimeLost); COMPARE_FIELD(DaysInQueue); COMPARE_FIELD(BalloonColour);