mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename Peep::special_sprite to SpecialSprite

This commit is contained in:
Tulio Leao 2020-06-07 21:23:59 -03:00
parent 89a084cbc9
commit 3ad2471a24
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/GameStateSnapshots.cpp
View File

@ -254,7 +254,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, current_ride_station);
COMPARE_FIELD(Peep, current_train);
COMPARE_FIELD(Peep, time_to_sitdown);
COMPARE_FIELD(Peep, special_sprite);
COMPARE_FIELD(Peep, SpecialSprite);
COMPARE_FIELD(Peep, ActionSpriteType);
COMPARE_FIELD(Peep, NextActionSpriteType);
COMPARE_FIELD(Peep, ActionSpriteImageOffset);

2
src/openrct2/actions/StaffHireNewAction.hpp
View File

@ -161,7 +161,7 @@ private:
newPeep->sprite_identifier = 1;
newPeep->window_invalidate_flags = 0;
newPeep->Action = PEEP_ACTION_NONE_2;
newPeep->special_sprite = 0;
newPeep->SpecialSprite = 0;
newPeep->ActionSpriteImageOffset = 0;
newPeep->WalkingFrameNum = 0;
newPeep->ActionSpriteType = PEEP_ACTION_SPRITE_TYPE_NONE;

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

@ -501,7 +501,7 @@ PeepActionSpriteType Peep::GetActionSpriteType()
{
if (Action >= PEEP_ACTION_NONE_1)
{ // PEEP_ACTION_NONE_1 or PEEP_ACTION_NONE_2
return PeepSpecialSpriteToSpriteTypeMap[special_sprite];
return PeepSpecialSpriteToSpriteTypeMap[SpecialSprite];
}
else if (Action < std::size(PeepActionToSpriteTypeMap))
{
@ -544,10 +544,10 @@ void Peep::UpdateCurrentActionSpriteType()
/* rct2: 0x00693BE5 */
void Peep::SwitchToSpecialSprite(uint8_t special_sprite_id)
{
if (special_sprite_id == special_sprite)
if (special_sprite_id == SpecialSprite)
return;
special_sprite = special_sprite_id;
SpecialSprite = special_sprite_id;
// If NONE_1 or NONE_2
if (Action >= PEEP_ACTION_NONE_1)
@ -745,7 +745,7 @@ void Peep::PickupAbort(int32_t old_x)
{
SetState(PEEP_STATE_FALLING);
Action = PEEP_ACTION_NONE_2;
special_sprite = 0;
SpecialSprite = 0;
ActionSpriteImageOffset = 0;
ActionSpriteType = PEEP_ACTION_SPRITE_TYPE_NONE;
PathCheckOptimisation = 0;
@ -794,7 +794,7 @@ bool Peep::Place(const TileCoordsXYZ& location, bool apply)
MoveTo(destination);
SetState(PEEP_STATE_FALLING);
Action = PEEP_ACTION_NONE_2;
special_sprite = 0;
SpecialSprite = 0;
ActionSpriteImageOffset = 0;
ActionSpriteType = PEEP_ACTION_SPRITE_TYPE_NONE;
PathCheckOptimisation = 0;
@ -1619,7 +1619,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords)
peep->outside_of_park = 1;
peep->state = PEEP_STATE_FALLING;
peep->Action = PEEP_ACTION_NONE_2;
peep->special_sprite = 0;
peep->SpecialSprite = 0;
peep->ActionSpriteImageOffset = 0;
peep->WalkingFrameNum = 0;
peep->ActionSpriteType = PEEP_ACTION_SPRITE_TYPE_NONE;

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

@ -653,7 +653,7 @@ struct Peep : SpriteBase
};
};
// Normally 0, 1 for carrying sliding board on spiral slide ride, 2 for carrying lawn mower
uint8_t special_sprite;
uint8_t SpecialSprite;
PeepActionSpriteType ActionSpriteType;
// Seems to be used like a local variable, as it's always set before calling SwitchNextActionSpriteType, which
// reads this again

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

@ -1392,7 +1392,7 @@ private:
// Peep vs. staff (including which kind)
dst->sprite_type = RCT1::GetPeepSpriteType(src->sprite_type);
dst->Action = static_cast<PeepActionType>(src->action);
dst->special_sprite = src->special_sprite;
dst->SpecialSprite = src->special_sprite;
dst->NextActionSpriteType = static_cast<PeepActionSpriteType>(src->next_action_sprite_type);
dst->ActionSpriteImageOffset = src->action_sprite_image_offset;
dst->WalkingFrameNum = src->no_action_frame_num;

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

@ -1176,7 +1176,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
dst->current_ride_station = src->current_ride_station;
dst->current_train = src->current_train;
dst->time_to_sitdown = src->time_to_sitdown;
dst->special_sprite = src->special_sprite;
dst->special_sprite = src->SpecialSprite;
dst->action_sprite_type = static_cast<uint8_t>(src->ActionSpriteType);
dst->next_action_sprite_type = static_cast<uint8_t>(src->NextActionSpriteType);
dst->action_sprite_image_offset = src->ActionSpriteImageOffset;

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

@ -1441,7 +1441,7 @@ public:
dst->current_ride_station = src->current_ride_station;
dst->current_train = src->current_train;
dst->time_to_sitdown = src->time_to_sitdown;
dst->special_sprite = src->special_sprite;
dst->SpecialSprite = src->special_sprite;
dst->ActionSpriteType = static_cast<PeepActionSpriteType>(src->action_sprite_type);
dst->NextActionSpriteType = static_cast<PeepActionSpriteType>(src->next_action_sprite_type);
dst->ActionSpriteImageOffset = src->action_sprite_image_offset;

2
test/tests/S6ImportExportTests.cpp
View File

@ -198,7 +198,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(current_ride_station);
COMPARE_FIELD(current_train);
COMPARE_FIELD(time_to_sitdown);
COMPARE_FIELD(special_sprite);
COMPARE_FIELD(SpecialSprite);
COMPARE_FIELD(ActionSpriteType);
COMPARE_FIELD(NextActionSpriteType);
COMPARE_FIELD(ActionSpriteImageOffset);