From 57a2dab0641c9b5c33e4ff6410d9972f39f7d2cf Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Wed, 3 Jun 2020 22:45:15 -0300 Subject: [PATCH] Rename Peep::NoActionFrameNum to WalkingFrameNum --- src/openrct2/GameStateSnapshots.cpp | 2 +- src/openrct2/actions/StaffHireNewAction.hpp | 2 +- src/openrct2/peep/Guest.cpp | 2 +- src/openrct2/peep/Peep.cpp | 10 +++++----- src/openrct2/peep/Peep.h | 2 +- src/openrct2/peep/Staff.cpp | 2 +- src/openrct2/rct1/S4Importer.cpp | 2 +- src/openrct2/rct2/S6Exporter.cpp | 2 +- src/openrct2/rct2/S6Importer.cpp | 2 +- test/tests/S6ImportExportTests.cpp | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 42e916c837..f3fbb46b2a 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -290,7 +290,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots { COMPARE_FIELD(Peep, PathfindHistory[i]); } - COMPARE_FIELD(Peep, NoActionFrameNum); + COMPARE_FIELD(Peep, WalkingFrameNum); COMPARE_FIELD(Peep, LitterCount); COMPARE_FIELD(Peep, GuestTimeOnRide); COMPARE_FIELD(Peep, DisgustingCount); diff --git a/src/openrct2/actions/StaffHireNewAction.hpp b/src/openrct2/actions/StaffHireNewAction.hpp index b0013fd458..b9b3aa9c45 100644 --- a/src/openrct2/actions/StaffHireNewAction.hpp +++ b/src/openrct2/actions/StaffHireNewAction.hpp @@ -163,7 +163,7 @@ private: newPeep->action = PEEP_ACTION_NONE_2; newPeep->special_sprite = 0; newPeep->action_sprite_image_offset = 0; - newPeep->NoActionFrameNum = 0; + newPeep->WalkingFrameNum = 0; newPeep->action_sprite_type = PEEP_ACTION_SPRITE_TYPE_NONE; newPeep->PathCheckOptimisation = 0; newPeep->type = PEEP_TYPE_STAFF; diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index 17decd09ef..ab661b8cfa 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -6765,7 +6765,7 @@ void Guest::SetSpriteType(PeepSpriteType new_sprite_type) sprite_type = new_sprite_type; action_sprite_image_offset = 0; - NoActionFrameNum = 0; + WalkingFrameNum = 0; if (action >= PEEP_ACTION_NONE_1) action = PEEP_ACTION_NONE_2; diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 537f385d05..ff884b4d5a 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -631,14 +631,14 @@ std::optional Peep::UpdateAction(int16_t& xy_distance) sprite_direction = nextDirection; CoordsXY loc = { x, y }; loc += word_981D7C[nextDirection / 8]; - NoActionFrameNum++; + WalkingFrameNum++; const rct_peep_animation* peepAnimation = g_peep_animation_entries[sprite_type].sprite_animation; const uint8_t* imageOffset = peepAnimation[action_sprite_type].frame_offsets; - if (NoActionFrameNum >= peepAnimation[action_sprite_type].num_frames) + if (WalkingFrameNum >= peepAnimation[action_sprite_type].num_frames) { - NoActionFrameNum = 0; + WalkingFrameNum = 0; } - action_sprite_image_offset = imageOffset[NoActionFrameNum]; + action_sprite_image_offset = imageOffset[WalkingFrameNum]; return loc; } @@ -1631,7 +1631,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords) peep->action = PEEP_ACTION_NONE_2; peep->special_sprite = 0; peep->action_sprite_image_offset = 0; - peep->NoActionFrameNum = 0; + peep->WalkingFrameNum = 0; peep->action_sprite_type = PEEP_ACTION_SPRITE_TYPE_NONE; peep->PeepFlags = 0; peep->FavouriteRide = RIDE_ID_NULL; diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index bc1aedadbf..a1ad3de117 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -700,7 +700,7 @@ struct Peep : SpriteBase uint32_t PeepFlags; rct12_xyzd8 PathfindGoal; rct12_xyzd8 PathfindHistory[4]; - uint8_t NoActionFrameNum; + uint8_t WalkingFrameNum; // 0x3F Litter Count split into lots of 3 with time, 0xC0 Time since last recalc uint8_t LitterCount; union diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index dc3cf382f9..c8695867c5 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -1856,7 +1856,7 @@ void Staff::Tick128UpdateStaff() sprite_type = newSpriteType; action_sprite_image_offset = 0; - NoActionFrameNum = 0; + WalkingFrameNum = 0; if (action < PEEP_ACTION_NONE_1) action = PEEP_ACTION_NONE_2; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 16f7c14bf6..d23ba62425 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1395,7 +1395,7 @@ private: dst->special_sprite = src->special_sprite; dst->next_action_sprite_type = static_cast(src->next_action_sprite_type); dst->action_sprite_image_offset = src->action_sprite_image_offset; - dst->NoActionFrameNum = src->no_action_frame_num; + dst->WalkingFrameNum = src->no_action_frame_num; dst->action_sprite_type = static_cast(src->action_sprite_type); dst->action_frame = src->action_frame; diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index c2731e03a2..5b9a96cff0 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -1217,7 +1217,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src) { dst->pathfind_history[i] = src->PathfindHistory[i]; } - dst->no_action_frame_num = src->NoActionFrameNum; + dst->no_action_frame_num = src->WalkingFrameNum; dst->litter_count = src->LitterCount; dst->time_on_ride = src->GuestTimeOnRide; dst->disgusting_count = src->DisgustingCount; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 2c4154fabc..56b91bb27c 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1482,7 +1482,7 @@ public: { dst->PathfindHistory[i] = src->pathfind_history[i]; } - dst->NoActionFrameNum = src->no_action_frame_num; + dst->WalkingFrameNum = src->no_action_frame_num; dst->LitterCount = src->litter_count; dst->GuestTimeOnRide = src->time_on_ride; dst->DisgustingCount = src->disgusting_count; diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index b3336f0086..f0afa9b8f4 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -243,7 +243,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right) COMPARE_FIELD(PathfindHistory[i].z); COMPARE_FIELD(PathfindHistory[i].direction); } - COMPARE_FIELD(NoActionFrameNum); + COMPARE_FIELD(WalkingFrameNum); COMPARE_FIELD(LitterCount); COMPARE_FIELD(GuestTimeOnRide); COMPARE_FIELD(DisgustingCount);