mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-23 19:02:04 -05:00
Code Issues Projects Releases Packages Wiki Activity

Rename Peep::step_progress to StepProgress

Browse source
This commit is contained in:
Tulio Leao 2020-06-07 20:00:07 -03:00
parent 71531445bb
commit c953da800a
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/openrct2/GameStateSnapshots.cpp
View file

@ -260,7 +260,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, action_sprite_image_offset);
COMPARE_FIELD(Peep, action);
COMPARE_FIELD(Peep, action_frame);
COMPARE_FIELD(Peep, step_progress);
COMPARE_FIELD(Peep, StepProgress);
COMPARE_FIELD(Peep, GuestNextInQueue);
COMPARE_FIELD(Peep, MazeLastEdge);
COMPARE_FIELD(Peep, InteractionRideIndex);

4
src/openrct2/peep/Peep.cpp
View file

@ -1122,8 +1122,8 @@ void Peep::Update()
stepsToTake += stepsToTake / 2;
}
uint32_t carryCheck = step_progress + stepsToTake;
step_progress = carryCheck;
uint32_t carryCheck = StepProgress + stepsToTake;
StepProgress = carryCheck;
if (carryCheck <= 255)
{
auto guest = AsGuest();

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

@ -661,7 +661,7 @@ struct Peep : SpriteBase
uint8_t action_sprite_image_offset;
PeepActionType action;
uint8_t action_frame;
uint8_t step_progress;
uint8_t StepProgress;
union
{
uint16_t MechanicTimeSinceCall; // time getting to ride to fix

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

@ -1423,7 +1423,7 @@ private:
dst->next_flags = src->next_flags;
dst->var_37 = src->var_37;
dst->time_to_consume = src->time_to_consume;
dst->step_progress = src->step_progress;
dst->StepProgress = src->step_progress;
dst->VandalismSeen = src->vandalism_seen;
dst->type = static_cast<PeepType>(src->type);

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

@ -1182,7 +1182,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
dst->action_sprite_image_offset = src->action_sprite_image_offset;
dst->action = static_cast<uint8_t>(src->action);
dst->action_frame = src->action_frame;
dst->step_progress = src->step_progress;
dst->step_progress = src->StepProgress;
dst->next_in_queue = src->GuestNextInQueue;
dst->direction = src->PeepDirection;
dst->interaction_ride_index = src->InteractionRideIndex;

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

@ -1447,7 +1447,7 @@ public:
dst->action_sprite_image_offset = src->action_sprite_image_offset;
dst->action = static_cast<PeepActionType>(src->action);
dst->action_frame = src->action_frame;
dst->step_progress = src->step_progress;
dst->StepProgress = src->step_progress;
dst->GuestNextInQueue = src->next_in_queue;
dst->PeepDirection = src->direction;
dst->InteractionRideIndex = src->interaction_ride_index;

2
test/tests/S6ImportExportTests.cpp
View file

@ -204,7 +204,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(action_sprite_image_offset);
COMPARE_FIELD(action);
COMPARE_FIELD(action_frame);
COMPARE_FIELD(step_progress);
COMPARE_FIELD(StepProgress);
COMPARE_FIELD(GuestNextInQueue);
COMPARE_FIELD(MazeLastEdge);
COMPARE_FIELD(InteractionRideIndex);