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

Rename Peep::path_check_optimisation to PathCheckOptimisation

This commit is contained in:
Tulio Leao 2020-05-31 18:28:20 -03:00 committed by Gymnasiast
parent 6dc08afdd0
commit fabdb8cdef
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/GameStateSnapshots.cpp
View File

@ -280,7 +280,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
{
COMPARE_FIELD(Peep, thoughts[i]);
}
COMPARE_FIELD(Peep, path_check_optimisation);
COMPARE_FIELD(Peep, PathCheckOptimisation);
COMPARE_FIELD(Peep, GuestHeadingToRideId);
COMPARE_FIELD(Peep, StaffOrders);
COMPARE_FIELD(Peep, Photo1RideRef);

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

@ -165,7 +165,7 @@ private:
newPeep->action_sprite_image_offset = 0;
newPeep->NoActionFrameNum = 0;
newPeep->action_sprite_type = PEEP_ACTION_SPRITE_TYPE_NONE;
newPeep->path_check_optimisation = 0;
newPeep->PathCheckOptimisation = 0;
newPeep->type = PEEP_TYPE_STAFF;
newPeep->outside_of_park = 0;
newPeep->PeepFlags = 0;

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

@ -471,8 +471,8 @@ static void peep_128_tick_update(Peep* peep, int32_t index)
*/
bool Peep::CheckForPath()
{
path_check_optimisation++;
if ((path_check_optimisation & 0xF) != (sprite_index & 0xF))
PathCheckOptimisation++;
if ((PathCheckOptimisation & 0xF) != (sprite_index & 0xF))
{
// This condition makes the check happen less often
// As a side effect peeps hover for a short,
@ -758,7 +758,7 @@ void Peep::PickupAbort(int32_t old_x)
special_sprite = 0;
action_sprite_image_offset = 0;
action_sprite_type = PEEP_ACTION_SPRITE_TYPE_NONE;
path_check_optimisation = 0;
PathCheckOptimisation = 0;
}
gPickupPeepImage = UINT32_MAX;
@ -807,7 +807,7 @@ bool Peep::Place(const TileCoordsXYZ& location, bool apply)
special_sprite = 0;
action_sprite_image_offset = 0;
action_sprite_type = PEEP_ACTION_SPRITE_TYPE_NONE;
path_check_optimisation = 0;
PathCheckOptimisation = 0;
sprite_position_tween_reset();
if (type == PEEP_TYPE_GUEST)
@ -1645,7 +1645,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords)
peep->MoveTo(coords);
peep->sprite_direction = 0;
peep->mass = (scenario_rand() & 0x1F) + 45;
peep->path_check_optimisation = 0;
peep->PathCheckOptimisation = 0;
peep->interaction_ride_index = RIDE_ID_NULL;
peep->type = PEEP_TYPE_GUEST;
peep->previous_ride = RIDE_ID_NULL;

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

@ -685,7 +685,7 @@ struct Peep : SpriteBase
uint8_t previous_ride;
uint16_t previous_ride_time_out;
rct_peep_thought thoughts[PEEP_MAX_THOUGHTS];
uint8_t path_check_optimisation; // see peep.checkForPath
uint8_t PathCheckOptimisation; // see peep.checkForPath
union
{
uint8_t StaffId;

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

@ -1525,7 +1525,7 @@ private:
dst->previous_ride = src->previous_ride;
dst->previous_ride_time_out = src->previous_ride_time_out;
dst->path_check_optimisation = 0;
dst->PathCheckOptimisation = 0;
dst->GuestHeadingToRideId = src->guest_heading_to_ride_id;
// Doubles as staff orders
dst->PeepIsLostCountdown = src->peep_is_lost_countdown;

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

@ -1207,7 +1207,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
dstThought->freshness = srcThought->freshness;
dstThought->fresh_timeout = srcThought->fresh_timeout;
}
dst->path_check_optimisation = src->path_check_optimisation;
dst->path_check_optimisation = src->PathCheckOptimisation;
dst->guest_heading_to_ride_id = src->GuestHeadingToRideId;
dst->peep_is_lost_countdown = src->PeepIsLostCountdown;
dst->photo1_ride_ref = src->Photo1RideRef;

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

@ -1472,7 +1472,7 @@ public:
dstThought->freshness = srcThought->freshness;
dstThought->fresh_timeout = srcThought->fresh_timeout;
}
dst->path_check_optimisation = src->path_check_optimisation;
dst->PathCheckOptimisation = src->path_check_optimisation;
dst->GuestHeadingToRideId = src->guest_heading_to_ride_id;
dst->PeepIsLostCountdown = src->peep_is_lost_countdown;
dst->Photo1RideRef = src->photo1_ride_ref;

2
test/tests/S6ImportExportTests.cpp
View File

@ -227,7 +227,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(thoughts[i].freshness);
COMPARE_FIELD(thoughts[i].fresh_timeout);
}
COMPARE_FIELD(path_check_optimisation);
COMPARE_FIELD(PathCheckOptimisation);
COMPARE_FIELD(GuestHeadingToRideId);
COMPARE_FIELD(StaffOrders);
COMPARE_FIELD(Photo1RideRef);