diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 9c7b47dad5..7ebe8253a8 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -228,7 +228,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots COMPARE_FIELD(Peep, destination_tolerance); COMPARE_FIELD(Peep, var_37); COMPARE_FIELD(Peep, energy); - COMPARE_FIELD(Peep, energy_target); + COMPARE_FIELD(Peep, EnergyTarget); COMPARE_FIELD(Peep, Happiness); COMPARE_FIELD(Peep, HappinessTarget); COMPARE_FIELD(Peep, Nausea); diff --git a/src/openrct2/actions/SetCheatAction.hpp b/src/openrct2/actions/SetCheatAction.hpp index e7f16ddfeb..ee643b86b6 100644 --- a/src/openrct2/actions/SetCheatAction.hpp +++ b/src/openrct2/actions/SetCheatAction.hpp @@ -595,7 +595,7 @@ private: break; case GUEST_PARAMETER_ENERGY: peep->energy = value; - peep->energy_target = value; + peep->EnergyTarget = value; break; case GUEST_PARAMETER_HUNGER: peep->Hunger = value; @@ -735,7 +735,7 @@ private: FOR_ALL_STAFF (spriteIndex, peep) { peep->energy = value; - peep->energy_target = value; + peep->EnergyTarget = value; } } diff --git a/src/openrct2/actions/StaffHireNewAction.hpp b/src/openrct2/actions/StaffHireNewAction.hpp index 8b055aedc5..8698c2e1bc 100644 --- a/src/openrct2/actions/StaffHireNewAction.hpp +++ b/src/openrct2/actions/StaffHireNewAction.hpp @@ -243,7 +243,7 @@ private: // Staff energy determines their walking speed newPeep->energy = 0x60; - newPeep->energy_target = 0x60; + newPeep->EnergyTarget = 0x60; newPeep->StaffMowingTimeout = 0; newPeep->StaffId = staffIndex; diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index 0de3373f0d..1bd164561e 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -475,7 +475,7 @@ static int32_t cc_staff(InteractiveConsole& console, const arguments_t& argv) Peep* peep = GET_PEEP(int_val[0]); peep->energy = int_val[1]; - peep->energy_target = int_val[1]; + peep->EnergyTarget = int_val[1]; } } else if (argv[1] == "costume") diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index cf13a427df..69b188dc5c 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -579,7 +579,7 @@ void Guest::HandleEasterEggName() Happiness = 250; HappinessTarget = 250; energy = 127; - energy_target = 127; + EnergyTarget = 127; Nausea = 0; NauseaTarget = 0; } @@ -933,8 +933,8 @@ void Guest::Tick128UpdateGuest(int32_t index) break; case PEEP_STATE_SITTING: - if (energy_target <= 135) - energy_target += 5; + if (EnergyTarget <= 135) + EnergyTarget += 5; if (Thirst >= 5) { @@ -1118,7 +1118,7 @@ void Guest::Tick128UpdateGuest(int32_t index) } uint8_t newEnergy = energy; - uint8_t newTargetEnergy = energy_target; + uint8_t newTargetEnergy = EnergyTarget; if (newEnergy >= newTargetEnergy) { newEnergy -= 2; @@ -3051,7 +3051,7 @@ static void peep_update_hunger(Peep* peep) { peep->Hunger -= 2; - peep->energy_target = std::min(peep->energy_target + 2, PEEP_MAX_ENERGY_TARGET); + peep->EnergyTarget = std::min(peep->EnergyTarget + 2, PEEP_MAX_ENERGY_TARGET); peep->Toilet = std::min(peep->Toilet + 1, 255); } } @@ -3064,9 +3064,9 @@ static void peep_update_hunger(Peep* peep) */ static void peep_decide_whether_to_leave_park(Peep* peep) { - if (peep->energy_target >= 33) + if (peep->EnergyTarget >= 33) { - peep->energy_target -= 2; + peep->EnergyTarget -= 2; } if (gClimateCurrent.Temperature >= 21 && peep->Thirst >= 5) diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 8875a29fa9..f84dea561c 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -1776,7 +1776,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords) * a peep with approx 34%-100% energy. (65 - 32) / (128 - 32) ≈ 34% */ uint8_t energy = (scenario_rand() % 64) + 65; peep->energy = energy; - peep->energy_target = energy; + peep->EnergyTarget = energy; increment_guests_heading_for_park(); diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index 583b921bf8..543b421d54 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -616,7 +616,7 @@ struct Peep : SpriteBase uint8_t destination_tolerance; // How close to destination before next action/state 0 = exact uint8_t var_37; uint8_t energy; - uint8_t energy_target; + uint8_t EnergyTarget; uint8_t Happiness; uint8_t HappinessTarget; uint8_t Nausea; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index e8e467cb85..244c219801 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1449,7 +1449,7 @@ private: dst->PeepDirection = src->direction; dst->energy = src->energy; - dst->energy_target = src->energy_target; + dst->EnergyTarget = src->energy_target; dst->Happiness = src->happiness; dst->HappinessTarget = src->happiness_target; dst->Nausea = src->nausea; diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 6f176fea20..9928e606c8 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -1150,7 +1150,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src) dst->destination_tolerance = src->destination_tolerance; dst->var_37 = src->var_37; dst->energy = src->energy; - dst->energy_target = src->energy_target; + dst->energy_target = src->EnergyTarget; dst->happiness = src->Happiness; dst->happiness_target = src->HappinessTarget; dst->nausea = src->Nausea; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 08bdfbbe84..d9f6fd1c6a 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1415,7 +1415,7 @@ public: dst->destination_tolerance = src->destination_tolerance; dst->var_37 = src->var_37; dst->energy = src->energy; - dst->energy_target = src->energy_target; + dst->EnergyTarget = src->energy_target; dst->Happiness = src->happiness; dst->HappinessTarget = src->happiness_target; dst->Nausea = src->nausea; diff --git a/src/openrct2/scripting/ScEntity.hpp b/src/openrct2/scripting/ScEntity.hpp index 200c3babb3..ca3bbe57cf 100644 --- a/src/openrct2/scripting/ScEntity.hpp +++ b/src/openrct2/scripting/ScEntity.hpp @@ -318,7 +318,7 @@ namespace OpenRCT2::Scripting uint8_t energyTarget_get() const { auto peep = GetPeep(); - return peep != nullptr ? peep->energy_target : 0; + return peep != nullptr ? peep->EnergyTarget : 0; } void energyTarget_set(uint8_t value) { @@ -326,7 +326,7 @@ namespace OpenRCT2::Scripting auto peep = GetPeep(); if (peep != nullptr) { - peep->energy_target = value; + peep->EnergyTarget = value; } } diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index 3de24d4c2a..3e9dcbe5a3 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -172,7 +172,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right) COMPARE_FIELD(destination_tolerance); COMPARE_FIELD(var_37); COMPARE_FIELD(energy); - COMPARE_FIELD(energy_target); + COMPARE_FIELD(EnergyTarget); COMPARE_FIELD(Happiness); COMPARE_FIELD(HappinessTarget); COMPARE_FIELD(Nausea);