From 65fa08ef357527febabbcca562091bfabc665405 Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Mon, 8 Jun 2020 14:06:00 +0200
Subject: [PATCH] Clean up GuestHeadingToRideId

---
 src/openrct2/peep/Guest.cpp            | 2 +-
 src/openrct2/peep/GuestPathfinding.cpp | 2 +-
 src/openrct2/peep/Peep.cpp             | 8 ++++----
 src/openrct2/peep/Peep.h               | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp
index d76625bbdd..c080c8fcad 100644
--- a/src/openrct2/peep/Guest.cpp
+++ b/src/openrct2/peep/Guest.cpp
@@ -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);
 }
diff --git a/src/openrct2/peep/GuestPathfinding.cpp b/src/openrct2/peep/GuestPathfinding.cpp
index ec616d84ab..3d5fc6946f 100644
--- a/src/openrct2/peep/GuestPathfinding.cpp
+++ b/src/openrct2/peep/GuestPathfinding.cpp
@@ -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)
diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp
index f51dc7f8e9..3657903772 100644
--- a/src/openrct2/peep/Peep.cpp
+++ b/src/openrct2/peep/Peep.cpp
@@ -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;
diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h
index f4755b623a..51a74a6285 100644
--- a/src/openrct2/peep/Peep.h
+++ b/src/openrct2/peep/Peep.h
@@ -695,7 +695,7 @@ struct Peep : SpriteBase
     union
     {
         uint8_t StaffId;
-        uint8_t GuestHeadingToRideId;
+        ride_id_t GuestHeadingToRideId;
     };
     union
     {