From 533695cbe602a22aaeb4fd7413fc6ff993b7bb91 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Mon, 8 Jun 2020 23:18:12 -0300 Subject: [PATCH] Rename Peep::hunger to Hunger --- src/openrct2-ui/windows/Guest.cpp | 2 +- src/openrct2/GameStateSnapshots.cpp | 2 +- src/openrct2/actions/SetCheatAction.hpp | 2 +- src/openrct2/peep/Guest.cpp | 24 ++++++++++++------------ src/openrct2/peep/Peep.cpp | 6 +++--- src/openrct2/peep/Peep.h | 2 +- src/openrct2/rct1/S4Importer.cpp | 2 +- src/openrct2/rct2/S6Exporter.cpp | 2 +- src/openrct2/rct2/S6Importer.cpp | 2 +- src/openrct2/scripting/ScEntity.hpp | 4 ++-- test/tests/S6ImportExportTests.cpp | 2 +- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 2365743920..d647f2b411 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -1432,7 +1432,7 @@ void window_guest_stats_paint(rct_window* w, rct_drawpixelinfo* dpi) y += LIST_ROW_HEIGHT; gfx_draw_string_left(dpi, STR_GUEST_STAT_HUNGER_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y); - int32_t hunger = peep->hunger; + int32_t hunger = peep->Hunger; if (hunger > 190) hunger = 190; diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 28c9dd3092..05f3d9e657 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -233,7 +233,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots COMPARE_FIELD(Peep, happiness_target); COMPARE_FIELD(Peep, nausea); COMPARE_FIELD(Peep, nausea_target); - COMPARE_FIELD(Peep, hunger); + COMPARE_FIELD(Peep, Hunger); COMPARE_FIELD(Peep, Thirst); COMPARE_FIELD(Peep, Toilet); COMPARE_FIELD(Peep, Mass); diff --git a/src/openrct2/actions/SetCheatAction.hpp b/src/openrct2/actions/SetCheatAction.hpp index 191f3a50b3..914f7c9b5e 100644 --- a/src/openrct2/actions/SetCheatAction.hpp +++ b/src/openrct2/actions/SetCheatAction.hpp @@ -598,7 +598,7 @@ private: peep->energy_target = value; break; case GUEST_PARAMETER_HUNGER: - peep->hunger = value; + peep->Hunger = value; break; case GUEST_PARAMETER_THIRST: peep->Thirst = value; diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index 9336f7c047..58f5acc201 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -728,8 +728,8 @@ void Guest::Tick128UpdateGuest(int32_t index) if (PeepFlags & PEEP_FLAGS_HUNGER) { - if (hunger >= 15) - hunger -= 15; + if (Hunger >= 15) + Hunger -= 15; } if (PeepFlags & PEEP_FLAGS_TOILET) @@ -851,7 +851,7 @@ void Guest::Tick128UpdateGuest(int32_t index) possible_thoughts[num_thoughts++] = PEEP_THOUGHT_TYPE_TIRED; } - if (hunger <= 10 && !HasFood()) + if (Hunger <= 10 && !HasFood()) { possible_thoughts[num_thoughts++] = PEEP_THOUGHT_TYPE_HUNGRY; } @@ -1026,9 +1026,9 @@ void Guest::Tick128UpdateGuest(int32_t index) energy = std::max(energy - 2, 0); } - if (hunger < 10) + if (Hunger < 10) { - hunger = std::max(hunger - 1, 0); + Hunger = std::max(Hunger - 1, 0); } if (Thirst < 10) @@ -1074,7 +1074,7 @@ void Guest::Tick128UpdateGuest(int32_t index) } else { - hunger = std::min(hunger + 7, 255); + Hunger = std::min(Hunger + 7, 255); Thirst = std::max(Thirst - 3, 0); Toilet = std::min(Toilet + 2, 255); } @@ -1522,7 +1522,7 @@ bool Guest::DecideAndBuyItem(Ride* ride, int32_t shopItem, money32 price) return false; } - if (ShopItems[shopItem].IsFood() && (hunger > 75)) + if (ShopItems[shopItem].IsFood() && (Hunger > 75)) { InsertNewThought(PEEP_THOUGHT_TYPE_NOT_HUNGRY, PEEP_THOUGHT_ITEM_NONE); return false; @@ -2859,7 +2859,7 @@ static void peep_update_ride_nausea_growth(Peep* peep, Ride* ride) { uint32_t nauseaMultiplier = std::clamp(256 - peep->happiness_target, 64, 200); uint32_t nauseaGrowthRateChange = (ride->nausea * nauseaMultiplier) / 512; - nauseaGrowthRateChange *= std::max(static_cast(128), peep->hunger) / 64; + nauseaGrowthRateChange *= std::max(static_cast(128), peep->Hunger) / 64; nauseaGrowthRateChange >>= (peep->NauseaTolerance & 3); peep->nausea_target = static_cast(std::min(peep->nausea_target + nauseaGrowthRateChange, 255u)); } @@ -2878,7 +2878,7 @@ static bool peep_should_go_on_ride_again(Peep* peep, Ride* ride) return false; if (peep->nausea > 160) return false; - if (peep->hunger < 30) + if (peep->Hunger < 30) return false; if (peep->Thirst < 20) return false; @@ -3047,9 +3047,9 @@ static PeepThoughtType peep_assess_surroundings(int16_t centre_x, int16_t centre */ static void peep_update_hunger(Peep* peep) { - if (peep->hunger >= 3) + if (peep->Hunger >= 3) { - peep->hunger -= 2; + peep->Hunger -= 2; peep->energy_target = std::min(peep->energy_target + 2, PEEP_MAX_ENERGY_TARGET); peep->Toilet = std::min(peep->Toilet + 1, 255); @@ -5994,7 +5994,7 @@ bool Guest::ShouldFindBench() if (HasFood()) { - if (hunger < 128 || happiness < 128) + if (Hunger < 128 || happiness < 128) { if (!GetNextIsSurface() && !GetNextIsSloped()) { diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 59717a0ca2..0c03ca9144 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -652,7 +652,7 @@ std::optional Peep::UpdateAction(int16_t& xy_distance) } // We are throwing up - hunger /= 2; + Hunger /= 2; nausea_target /= 2; if (nausea < 30) @@ -1698,11 +1698,11 @@ Peep* Peep::Generate(const CoordsXYZ& coords) /* Scenario editor limits initial guest hunger to between 37..253. * To be on the safe side, assume the value could have been hacked * to any value 0..255. */ - peep->hunger = gGuestInitialHunger; + peep->Hunger = gGuestInitialHunger; /* Initial value will vary by -15..16 */ int8_t hungerDelta = (scenario_rand() & 0x1F) - 15; /* Adjust by the delta, clamping at min=0 and max=255. */ - peep->hunger = std::clamp(peep->hunger + hungerDelta, 0, PEEP_MAX_HUNGER); + peep->Hunger = std::clamp(peep->Hunger + hungerDelta, 0, PEEP_MAX_HUNGER); /* Scenario editor limits initial guest thirst to between 37..253. * To be on the safe side, assume the value could have been hacked diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index 496887dd92..b49e609e17 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -621,7 +621,7 @@ struct Peep : SpriteBase uint8_t happiness_target; uint8_t nausea; uint8_t nausea_target; - uint8_t hunger; + uint8_t Hunger; uint8_t Thirst; uint8_t Toilet; uint8_t Mass; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index b173d3e19b..832fa03132 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1454,7 +1454,7 @@ private: dst->happiness_target = src->happiness_target; dst->nausea = src->nausea; dst->nausea_target = src->nausea_target; - dst->hunger = src->hunger; + dst->Hunger = src->hunger; dst->Thirst = src->thirst; dst->Toilet = src->toilet; dst->Mass = src->mass; diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 4aa1083bbd..f547fc9ee9 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -1155,7 +1155,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src) dst->happiness_target = src->happiness_target; dst->nausea = src->nausea; dst->nausea_target = src->nausea_target; - dst->hunger = src->hunger; + dst->hunger = src->Hunger; dst->thirst = src->Thirst; dst->toilet = src->Toilet; dst->mass = src->Mass; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index c947d40256..9ae2207be4 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1420,7 +1420,7 @@ public: dst->happiness_target = src->happiness_target; dst->nausea = src->nausea; dst->nausea_target = src->nausea_target; - dst->hunger = src->hunger; + dst->Hunger = src->hunger; dst->Thirst = src->thirst; dst->Toilet = src->toilet; dst->Mass = src->mass; diff --git a/src/openrct2/scripting/ScEntity.hpp b/src/openrct2/scripting/ScEntity.hpp index 09992aeab8..e9c6b7ce12 100644 --- a/src/openrct2/scripting/ScEntity.hpp +++ b/src/openrct2/scripting/ScEntity.hpp @@ -521,7 +521,7 @@ namespace OpenRCT2::Scripting uint8_t hunger_get() const { auto peep = GetPeep(); - return peep != nullptr ? peep->hunger : 0; + return peep != nullptr ? peep->Hunger : 0; } void hunger_set(uint8_t value) { @@ -529,7 +529,7 @@ namespace OpenRCT2::Scripting auto peep = GetPeep(); if (peep != nullptr) { - peep->hunger = value; + peep->Hunger = value; } } diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index d466d8e8da..33d639dfad 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -177,7 +177,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right) COMPARE_FIELD(happiness_target); COMPARE_FIELD(nausea); COMPARE_FIELD(nausea_target); - COMPARE_FIELD(hunger); + COMPARE_FIELD(Hunger); COMPARE_FIELD(Thirst); COMPARE_FIELD(Toilet); COMPARE_FIELD(Mass);