mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Clean up GuestHeadingToRideId

Browse Source
This commit is contained in:
Gymnasiast
2020-06-08 14:06:00 +02:00
parent 0dd5b3bbda
commit 65fa08ef35
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6925,5 +6925,5 @@ void Guest::UpdateSpriteType()
bool Guest::HeadingForRideOrParkExit() const
{
return (PeepFlags & PEEP_FLAGS_LEAVING_PARK) || (GuestHeadingToRideId != 0xFF);
return (PeepFlags & PEEP_FLAGS_LEAVING_PARK) || (GuestHeadingToRideId != RIDE_ID_NULL);
}

2
src/openrct2/peep/GuestPathfinding.cpp
View File

@@ -2052,7 +2052,7 @@ int32_t guest_path_finding(Guest* peep)
return guest_path_find_park_entrance(peep, edges);
}
if (peep->GuestHeadingToRideId == 0xFF)
if (peep->GuestHeadingToRideId == RIDE_ID_NULL)
{
#if defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1
if (gPathFindDebug)

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

@@ -1181,7 +1181,7 @@ void peep_problem_warnings_update()
break;
case PEEP_THOUGHT_TYPE_HUNGRY: // 0x14
if (peep->GuestHeadingToRideId == 0xFF)
if (peep->GuestHeadingToRideId == RIDE_ID_NULL)
{
hunger_counter++;
break;
@@ -1192,7 +1192,7 @@ void peep_problem_warnings_update()
break;
case PEEP_THOUGHT_TYPE_THIRSTY:
if (peep->GuestHeadingToRideId == 0xFF)
if (peep->GuestHeadingToRideId == RIDE_ID_NULL)
{
thirst_counter++;
break;
@@ -1203,7 +1203,7 @@ void peep_problem_warnings_update()
break;
case PEEP_THOUGHT_TYPE_TOILET:
if (peep->GuestHeadingToRideId == 0xFF)
if (peep->GuestHeadingToRideId == RIDE_ID_NULL)
{
toilet_counter++;
break;
@@ -2940,7 +2940,7 @@ static bool peep_interact_with_shop(Peep* peep, int16_t x, int16_t y, TileElemen
else
{
if (peep->GuestHeadingToRideId == rideIndex)
peep->GuestHeadingToRideId = 0xFF;
peep->GuestHeadingToRideId = RIDE_ID_NULL;
peep->ActionSpriteImageOffset = _unk_F1AEF0;
peep->SetState(PEEP_STATE_BUYING);
peep->CurrentRide = rideIndex;

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

@@ -695,7 +695,7 @@ struct Peep : SpriteBase
union
{
uint8_t StaffId;
uint8_t GuestHeadingToRideId;
ride_id_t GuestHeadingToRideId;
};
union
{