From 53f6bd8340f6174edf6eac5a6769bcb03ad6ee66 Mon Sep 17 00:00:00 2001
From: hdpoliveira <hdpoliveira@gmail.com>
Date: Sun, 19 Apr 2020 01:33:05 -0300
Subject: [PATCH] Part of #9473: Create Vehicle::PeepEasterEggHereWeAre

Converted from vehicle_peep_easteregg_here_we_are
---
 src/openrct2/ride/Vehicle.cpp | 13 +++++++------
 src/openrct2/ride/Vehicle.h   |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index 7186859aa2..ae07ea0a5b 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -2974,18 +2974,19 @@ static bool vehicle_can_depart_synchronised(Vehicle* vehicle)
  *
  *  rct2: 0x006D9EB0
  */
-void vehicle_peep_easteregg_here_we_are(const Vehicle* vehicle)
+void Vehicle::PeepEasterEggHereWeAre() const
 {
+    const Vehicle* vehicle = this;
     uint16_t spriteId = vehicle->sprite_index;
     do
     {
         vehicle = GET_VEHICLE(spriteId);
         for (int32_t i = 0; i < vehicle->num_peeps; ++i)
         {
-            Peep* peep = GET_PEEP(vehicle->peep[i]);
-            if (peep->peep_flags & PEEP_FLAGS_HERE_WE_ARE)
+            Peep* curPeep = GET_PEEP(vehicle->peep[i]);
+            if (curPeep->peep_flags & PEEP_FLAGS_HERE_WE_ARE)
             {
-                peep->InsertNewThought(PEEP_THOUGHT_TYPE_HERE_WE_ARE, peep->current_ride);
+                curPeep->InsertNewThought(PEEP_THOUGHT_TYPE_HERE_WE_ARE, curPeep->current_ride);
             }
         }
     } while ((spriteId = vehicle->next_vehicle_on_train) != SPRITE_INDEX_NULL);
@@ -3172,7 +3173,7 @@ void Vehicle::UpdateDeparting()
         }
 
         sub_state = 1;
-        vehicle_peep_easteregg_here_we_are(this);
+        PeepEasterEggHereWeAre();
 
         if (rideEntry->flags & RIDE_ENTRY_FLAG_PLAY_DEPART_SOUND)
         {
@@ -4156,7 +4157,7 @@ void Vehicle::UpdateTravellingCableLift()
         }
 
         sub_state = 1;
-        vehicle_peep_easteregg_here_we_are(this);
+        PeepEasterEggHereWeAre();
         if (!(curRide->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
         {
             if (update_flags & VEHICLE_UPDATE_FLAG_TESTING)
diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h
index 3680698d4f..3eed9f4733 100644
--- a/src/openrct2/ride/Vehicle.h
+++ b/src/openrct2/ride/Vehicle.h
@@ -360,6 +360,7 @@ private:
     bool CurrentTowerElementIsTop();
     bool UpdateTrackMotionForwards(rct_ride_entry_vehicle* vehicleEntry, Ride* curRide, rct_ride_entry* rideEntry);
     bool UpdateTrackMotionBackwards(rct_ride_entry_vehicle* vehicleEntry, Ride* curRide, rct_ride_entry* rideEntry);
+    void PeepEasterEggHereWeAre() const;
 };
 
 struct train_ref
@@ -562,7 +563,6 @@ int32_t vehicle_get_total_num_peeps(const Vehicle* vehicle);
 void vehicle_invalidate_window(Vehicle* vehicle);
 void vehicle_update_test_finish(Vehicle* vehicle);
 void vehicle_test_reset(Vehicle* vehicle);
-void vehicle_peep_easteregg_here_we_are(const Vehicle* vehicle);
 const rct_vehicle_info* vehicle_get_move_info(int32_t trackSubposition, int32_t typeAndDirection, int32_t offset);
 uint16_t vehicle_get_move_info_size(int32_t trackSubposition, int32_t typeAndDirection);