mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Rename Peep::disgusting_count to DisgustingCount

Browse Source
This commit is contained in:
Tulio Leao
2020-05-30 19:49:30 -03:00
parent a987a9ee5e
commit 0c502988ef
8 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/GameStateSnapshots.cpp
View File

@@ -293,7 +293,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, no_action_frame_num);
COMPARE_FIELD(Peep, litter_count);
COMPARE_FIELD(Peep, time_on_ride);
COMPARE_FIELD(Peep, disgusting_count);
COMPARE_FIELD(Peep, DisgustingCount);
COMPARE_FIELD(Peep, PaidToEnter);
COMPARE_FIELD(Peep, PaidOnRides);
COMPARE_FIELD(Peep, PaidOnFood);

2
src/openrct2/peep/Guest.cpp
View File

@@ -6212,7 +6212,7 @@ static void peep_update_walking_break_scenery(Peep* peep)
if (peep->state != PEEP_STATE_WALKING)
return;
if ((peep->litter_count & 0xC0) != 0xC0 && (peep->disgusting_count & 0xC0) != 0xC0)
if ((peep->litter_count & 0xC0) != 0xC0 && (peep->DisgustingCount & 0xC0) != 0xC0)
return;
if ((scenario_rand() & 0xFFFF) > 3276)

12
src/openrct2/peep/Peep.cpp
View File

@@ -1762,7 +1762,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords)
peep->item_extra_flags = 0;
peep->guest_heading_to_ride_id = RIDE_ID_NULL;
peep->litter_count = 0;
peep->disgusting_count = 0;
peep->DisgustingCount = 0;
peep->VandalismSeen = 0;
peep->PaidToEnter = 0;
peep->PaidOnRides = 0;
@@ -2727,14 +2727,14 @@ static void peep_footpath_move_forward(Peep* peep, int16_t x, int16_t y, TileEle
litter_count = std::min(static_cast<uint8_t>(3), litter_count);
sick_count = std::min(static_cast<uint8_t>(3), sick_count);
uint8_t disgusting_time = peep->disgusting_count & 0xC0;
uint8_t disgusting_count = ((peep->disgusting_count & 0xF) << 2) | sick_count;
peep->disgusting_count = disgusting_count | disgusting_time;
uint8_t disgusting_time = peep->DisgustingCount & 0xC0;
uint8_t disgusting_count = ((peep->DisgustingCount & 0xF) << 2) | sick_count;
peep->DisgustingCount = disgusting_count | disgusting_time;
if (disgusting_time & 0xC0 && (scenario_rand() & 0xFFFF) <= 4369)
{
// Reduce the disgusting time
peep->disgusting_count -= 0x40;
peep->DisgustingCount -= 0x40;
}
else
{
@@ -2749,7 +2749,7 @@ static void peep_footpath_move_forward(Peep* peep, int16_t x, int16_t y, TileEle
peep->InsertNewThought(PEEP_THOUGHT_TYPE_PATH_DISGUSTING, PEEP_THOUGHT_ITEM_NONE);
peep->happiness_target = std::max(0, peep->happiness_target - 17);
// Reset disgusting time
peep->disgusting_count |= 0xC0;
peep->DisgustingCount |= 0xC0;
}
}

2
src/openrct2/peep/Peep.h
View File

@@ -709,7 +709,7 @@ struct Peep : SpriteBase
uint8_t staff_mowing_timeout;
};
// 0x3F Sick Count split into lots of 3 with time, 0xC0 Time since last recalc
uint8_t disgusting_count;
uint8_t DisgustingCount;
union
{
money16 PaidToEnter;

2
src/openrct2/rct1/S4Importer.cpp
View File

@@ -1460,7 +1460,7 @@ private:
dst->mass = src->mass;
dst->litter_count = src->litter_count;
dst->disgusting_count = src->disgusting_count;
dst->DisgustingCount = src->disgusting_count;
dst->intensity = static_cast<IntensityRange>(src->intensity);
dst->nausea_tolerance = src->nausea_tolerance;

2
src/openrct2/rct2/S6Exporter.cpp
View File

@@ -1220,7 +1220,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
dst->no_action_frame_num = src->no_action_frame_num;
dst->litter_count = src->litter_count;
dst->time_on_ride = src->time_on_ride;
dst->disgusting_count = src->disgusting_count;
dst->disgusting_count = src->DisgustingCount;
dst->paid_to_enter = src->PaidToEnter;
dst->paid_on_rides = src->PaidOnRides;
dst->paid_on_food = src->PaidOnFood;

2
src/openrct2/rct2/S6Importer.cpp
View File

@@ -1485,7 +1485,7 @@ public:
dst->no_action_frame_num = src->no_action_frame_num;
dst->litter_count = src->litter_count;
dst->time_on_ride = src->time_on_ride;
dst->disgusting_count = src->disgusting_count;
dst->DisgustingCount = src->disgusting_count;
dst->PaidToEnter = src->paid_to_enter;
dst->PaidOnRides = src->paid_on_rides;
dst->PaidOnFood = src->paid_on_food;

2
test/tests/S6ImportExportTests.cpp
View File

@@ -246,7 +246,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(no_action_frame_num);
COMPARE_FIELD(litter_count);
COMPARE_FIELD(time_on_ride);
COMPARE_FIELD(disgusting_count);
COMPARE_FIELD(DisgustingCount);
COMPARE_FIELD(PaidToEnter);
COMPARE_FIELD(PaidOnRides);
COMPARE_FIELD(PaidOnFood);