mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 21:13:05 +01:00
Code Issues Releases Wiki Activity

Rename Peep::litter_count to LitterCount

Browse Source
This commit is contained in:
Tulio Leao
2020-05-31 17:29:44 -03:00
committed by Gymnasiast
parent 7665d1386f
commit 0933cd4e57
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

@@ -291,7 +291,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, pathfind_history[i]);
}
COMPARE_FIELD(Peep, no_action_frame_num);
COMPARE_FIELD(Peep, litter_count);
COMPARE_FIELD(Peep, LitterCount);
COMPARE_FIELD(Peep, TimeOnRide);
COMPARE_FIELD(Peep, DisgustingCount);
COMPARE_FIELD(Peep, PaidToEnter);

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->DisgustingCount & 0xC0) != 0xC0)
if ((peep->LitterCount & 0xC0) != 0xC0 && (peep->DisgustingCount & 0xC0) != 0xC0)
return;
if ((scenario_rand() & 0xFFFF) > 3276)

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

@@ -1761,7 +1761,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords)
peep->ItemStandardFlags = 0;
peep->item_extra_flags = 0;
peep->guest_heading_to_ride_id = RIDE_ID_NULL;
peep->litter_count = 0;
peep->LitterCount = 0;
peep->DisgustingCount = 0;
peep->VandalismSeen = 0;
peep->PaidToEnter = 0;
@@ -2753,14 +2753,14 @@ static void peep_footpath_move_forward(Peep* peep, int16_t x, int16_t y, TileEle
}
}
uint8_t litter_time = peep->litter_count & 0xC0;
litter_count = ((peep->litter_count & 0xF) << 2) | litter_count;
peep->litter_count = litter_count | litter_time;
uint8_t litter_time = peep->LitterCount & 0xC0;
litter_count = ((peep->LitterCount & 0xF) << 2) | litter_count;
peep->LitterCount = litter_count | litter_time;
if (litter_time & 0xC0 && (scenario_rand() & 0xFFFF) <= 4369)
{
// Reduce the litter time
peep->litter_count -= 0x40;
peep->LitterCount -= 0x40;
}
else
{
@@ -2775,7 +2775,7 @@ static void peep_footpath_move_forward(Peep* peep, int16_t x, int16_t y, TileEle
peep->InsertNewThought(PEEP_THOUGHT_TYPE_BAD_LITTER, PEEP_THOUGHT_ITEM_NONE);
peep->happiness_target = std::max(0, peep->happiness_target - 17);
// Reset litter time
peep->litter_count |= 0xC0;
peep->LitterCount |= 0xC0;
}
}

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

@@ -702,7 +702,7 @@ struct Peep : SpriteBase
rct12_xyzd8 pathfind_history[4];
uint8_t no_action_frame_num;
// 0x3F Litter Count split into lots of 3 with time, 0xC0 Time since last recalc
uint8_t litter_count;
uint8_t LitterCount;
union
{
uint8_t TimeOnRide;

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

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

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

@@ -1218,7 +1218,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
dst->pathfind_history[i] = src->pathfind_history[i];
}
dst->no_action_frame_num = src->no_action_frame_num;
dst->litter_count = src->litter_count;
dst->litter_count = src->LitterCount;
dst->time_on_ride = src->TimeOnRide;
dst->disgusting_count = src->DisgustingCount;
dst->paid_to_enter = src->PaidToEnter;

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

@@ -1483,7 +1483,7 @@ public:
dst->pathfind_history[i] = src->pathfind_history[i];
}
dst->no_action_frame_num = src->no_action_frame_num;
dst->litter_count = src->litter_count;
dst->LitterCount = src->litter_count;
dst->TimeOnRide = src->time_on_ride;
dst->DisgustingCount = src->disgusting_count;
dst->PaidToEnter = src->paid_to_enter;