From d342272dda56aa509590903a5d5bc1beeb14cbef Mon Sep 17 00:00:00 2001
From: Michael Steenbeek <m.o.steenbeek@gmail.com>
Date: Thu, 12 Oct 2017 13:35:04 +0200
Subject: [PATCH] Fix usage of RIDE_ID_NULL

---
 src/openrct2/peep/peep.c         | 2 +-
 src/openrct2/rct1/S4Importer.cpp | 2 +-
 src/openrct2/ride/ride.c         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/openrct2/peep/peep.c b/src/openrct2/peep/peep.c
index 80b21447e9..54f81b21c6 100644
--- a/src/openrct2/peep/peep.c
+++ b/src/openrct2/peep/peep.c
@@ -7174,7 +7174,7 @@ rct_peep *peep_generate(sint32 x, sint32 y, sint32 z)
     peep->no_action_frame_no = 0;
     peep->action_sprite_type = 0;
     peep->peep_flags = 0;
-    peep->favourite_ride = 0xFF;
+    peep->favourite_ride = RIDE_ID_NULL;
     peep->favourite_ride_rating = 0;
 
     const rct_sprite_bounds* spriteBounds = g_peep_animation_entries[peep->sprite_type].sprite_bounds;
diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp
index 6ad0717830..ff119ebb9c 100644
--- a/src/openrct2/rct1/S4Importer.cpp
+++ b/src/openrct2/rct1/S4Importer.cpp
@@ -1482,7 +1482,7 @@ private:
         }
         else
         {
-            dst->favourite_ride = RIDE_INDEX_NULL;
+            dst->favourite_ride = RIDE_ID_NULL;
             dst->favourite_ride_rating = 0;
         }
 
diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c
index c6b8c8aabb..471af7986b 100644
--- a/src/openrct2/ride/ride.c
+++ b/src/openrct2/ride/ride.c
@@ -403,7 +403,7 @@ void ride_update_favourited_stat()
     FOR_ALL_PEEPS(spriteIndex, peep) {
         if (peep->linked_list_type_offset != SPRITE_LIST_PEEP * 2)
             return;
-        if (peep->favourite_ride != 0xff) {
+        if (peep->favourite_ride != RIDE_ID_NULL) {
             ride = &gRideList[peep->favourite_ride];
             ride->guests_favourite++;
             ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_CUSTOMER;