From 4a6b2f2ef2ee431c24bcc88b8089001abde83131 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sun, 11 Sep 2016 00:05:32 +0100
Subject: [PATCH] Integrate gRides and gRideMeasurements

---
 src/addresses.h |  2 +-
 src/ride/ride.c | 10 ++++++++--
 src/ride/ride.h |  7 ++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/addresses.h b/src/addresses.h
index 17c8863cc4..5cea5a14fa 100644
--- a/src/addresses.h
+++ b/src/addresses.h
@@ -220,7 +220,6 @@
 #define RCT2_ADDRESS_SAVED_VIEW_Y					0x0138869C
 #define RCT2_ADDRESS_SAVED_VIEW_ZOOM				0x0138869E
 #define RCT2_ADDRESS_SAVED_VIEW_ROTATION			0x0138869F
-#define RCT2_ADDRESS_RIDE_MEASUREMENTS				0x0138B60C
 
 #define RCT2_ADDRESS_GRASS_SCENERY_TILEPOS			0x013B0E70
 
@@ -580,6 +579,7 @@
 #define RCT2_ADDRESS_SCENARIO_DETAILS				0x0135924A
 #define RCT2_ADDRESS_SAVED_AGE						0x01388698
 #define RCT2_ADDRESS_NUM_MAP_ANIMATIONS				0x0138B580
+#define RCT2_ADDRESS_RIDE_MEASUREMENTS				0x0138B60C
 
 #define RCT2_ADDRESS_STAFF_PATROL_AREAS				0x013B0E72
 #define RCT2_ADDRESS_STAFF_MODE_ARRAY				0x013CA672
diff --git a/src/ride/ride.c b/src/ride/ride.c
index 5458eb1cfe..b35577cd38 100644
--- a/src/ride/ride.c
+++ b/src/ride/ride.c
@@ -129,8 +129,14 @@ static const int RideInspectionInterval[] = {
 	10, 20, 30, 45, 60, 120, 0, 0
 };
 
-rct_ride* gRideList = RCT2_ADDRESS(RCT2_ADDRESS_RIDE_LIST, rct_ride);
-rct_ride_measurement *gRideMeasurements = RCT2_ADDRESS(RCT2_ADDRESS_RIDE_MEASUREMENTS, rct_ride_measurement);
+#ifdef NO_RCT2
+rct_ride gRideList[MAX_RIDES];
+#else
+rct_ride *gRideList = RCT2_ADDRESS(RCT2_ADDRESS_RIDE_LIST, rct_ride);
+#endif
+
+rct_ride_measurement gRideMeasurements[MAX_RIDE_MEASUREMENTS];
+
 uint16 gRideCount;
 bool gGotoStartPlacementMode = false;
 int gRideRemoveTrackPieceCallbackX;
diff --git a/src/ride/ride.h b/src/ride/ride.h
index 24f17bd611..138468df26 100644
--- a/src/ride/ride.h
+++ b/src/ride/ride.h
@@ -926,8 +926,13 @@ extern uint32 gSamePriceThroughoutParkB;
 
 extern const uint8 gRideClassifications[255];
 
+#ifdef NO_RCT2
+extern rct_ride gRideList[255];
+#else
 extern rct_ride *gRideList;
-extern rct_ride_measurement *gRideMeasurements;
+#endif
+
+extern rct_ride_measurement gRideMeasurements[MAX_RIDE_MEASUREMENTS];
 extern uint16 gRideCount;
 
 extern money32 _currentTrackPrice;