diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index a8af3ac086..c3adcef3cf 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -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); diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 918a58d17b..ec38cf1cb9 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -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(); diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index 1410c4c051..d268debab5 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -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 diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 30a2bb8538..ced597bf2a 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -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(src->type); diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 0b0dd720f0..9bda85e0bd 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -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(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; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index fc193f0c54..1e7179fc83 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1447,7 +1447,7 @@ public: dst->action_sprite_image_offset = src->action_sprite_image_offset; dst->action = static_cast(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; diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index a684d2c0c1..72ce2ccb2b 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -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);