mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Rename Peep::time_to_sitdown to TimeToSitdown

Browse Source
This commit is contained in:
Tulio Leao
2020-06-07 21:45:12 -03:00
parent 267bec698f
commit 7d25480a4d
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/GameStateSnapshots.cpp
View File

@@ -253,7 +253,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, current_ride);
COMPARE_FIELD(Peep, current_ride_station);
COMPARE_FIELD(Peep, current_train);
COMPARE_FIELD(Peep, time_to_sitdown);
COMPARE_FIELD(Peep, TimeToSitdown);
COMPARE_FIELD(Peep, SpecialSprite);
COMPARE_FIELD(Peep, ActionSpriteType);
COMPARE_FIELD(Peep, NextActionSpriteType);

6
src/openrct2/peep/Guest.cpp
View File

@@ -1197,8 +1197,8 @@ void Guest::TryGetUpFromSitting()
if (HasFood())
return;
time_to_sitdown--;
if (time_to_sitdown)
TimeToSitdown--;
if (TimeToSitdown)
return;
SetState(PEEP_STATE_WALKING);
@@ -1239,7 +1239,7 @@ void Guest::UpdateSitting()
sub_state = PEEP_SITTING_SAT_DOWN;
// Sets time to sit on seat
time_to_sitdown = (129 - energy) * 16 + 50;
TimeToSitdown = (129 - energy) * 16 + 50;
}
else if (sub_state == PEEP_SITTING_SAT_DOWN)
{

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

@@ -645,7 +645,7 @@ struct Peep : SpriteBase
uint8_t current_car;
uint8_t current_seat;
};
uint16_t time_to_sitdown;
uint16_t TimeToSitdown;
struct
{
uint8_t TimeToStand;

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

@@ -1175,7 +1175,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
dst->current_ride = src->current_ride;
dst->current_ride_station = src->current_ride_station;
dst->current_train = src->current_train;
dst->time_to_sitdown = src->time_to_sitdown;
dst->time_to_sitdown = src->TimeToSitdown;
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);

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

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

2
test/tests/S6ImportExportTests.cpp
View File

@@ -197,7 +197,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(current_ride);
COMPARE_FIELD(current_ride_station);
COMPARE_FIELD(current_train);
COMPARE_FIELD(time_to_sitdown);
COMPARE_FIELD(TimeToSitdown);
COMPARE_FIELD(SpecialSprite);
COMPARE_FIELD(ActionSpriteType);
COMPARE_FIELD(NextActionSpriteType);