From 612de0e5670ebd178274841fbdc184796d0b48c6 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sun, 14 Aug 2016 16:22:30 +0100
Subject: [PATCH] Integrate 3 more park globals

---
 src/addresses.h  | 8 ++++----
 src/world/park.c | 3 +++
 src/world/park.h | 7 +++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/addresses.h b/src/addresses.h
index c94b2327ba..0913d78a5a 100644
--- a/src/addresses.h
+++ b/src/addresses.h
@@ -214,9 +214,6 @@
 #define RCT2_ADDRESS_LAST_ENTRANCE_STYLE			0x01358840
 #define RCT2_ADDRESS_SAME_PRICE_THROUGHOUT_EXTENDED	0x0135934C
 
-#define RCT2_ADDRESS_LAND_COST						0x01358770
-#define RCT2_ADDRESS_CONSTRUCTION_RIGHTS_COST		0x01358772
-
 #define RCT2_ADDRESS_PEEP_SPAWNS					0x013573F2
 
 #define RCT2_ADDRESS_HANDYMAN_COLOUR				0x01357BCD
@@ -227,7 +224,6 @@
 #define RCT2_ADDRESS_MAP_SIZE_MINUS_2				0x01358832
 #define RCT2_ADDRESS_MAP_SIZE						0x01358834
 #define RCT2_ADDRESS_MAP_MAX_XY						0x01358836
-#define RCT2_ADDRESS_PARK_SIZE						0x013580EA
 
 #define RCT2_TOTAL_RIDE_VALUE						0x013580EE
 
@@ -590,6 +586,10 @@
 #define RCT2_ADDRESS_RESEARCHED_TRACK_TYPES_B		0x01357644
 #define RCT2_ADDRESS_RESEARCHED_SCENERY_ITEMS		0x01357BD0
 
+#define RCT2_ADDRESS_PARK_SIZE						0x013580EA
+#define RCT2_ADDRESS_LAND_COST						0x01358770
+#define RCT2_ADDRESS_CONSTRUCTION_RIGHTS_COST		0x01358772
+
 #define RCT2_ADDRESS_CLIMATE						0x013CA746
 #define RCT2_ADDRESS_CURRENT_WEATHER				0x013CA74A
 #define RCT2_ADDRESS_NEXT_WEATHER					0x013CA74B
diff --git a/src/world/park.c b/src/world/park.c
index f68583829d..562078cf3c 100644
--- a/src/world/park.c
+++ b/src/world/park.c
@@ -40,6 +40,9 @@ uint32 gParkNameArgs;
 uint32 gParkFlags;
 uint16 gParkRating;
 money16 gParkEntranceFee;
+uint16 gParkSize;
+money16 gLandPrice;
+money16 gConstructionRightsPrice;
 
 uint32 gTotalAdmissions;
 money32 gTotalIncomeFromAdmissions;
diff --git a/src/world/park.h b/src/world/park.h
index a6a07101c9..80806bace3 100644
--- a/src/world/park.h
+++ b/src/world/park.h
@@ -44,15 +44,14 @@ enum {
 	PARK_FLAGS_SIX_FLAGS_DEPRECATED = (1 << 19) // Not used anymore
 };
 
-#define gParkSize					RCT2_GLOBAL(RCT2_ADDRESS_PARK_SIZE, uint16)
-#define gLandPrice					RCT2_GLOBAL(RCT2_ADDRESS_LAND_COST, money16)
-#define gConstructionRightsPrice	RCT2_GLOBAL(RCT2_ADDRESS_CONSTRUCTION_RIGHTS_COST, money16)
-
 extern rct_string_id gParkName;
 extern uint32 gParkNameArgs;
 extern uint32 gParkFlags;
 extern uint16 gParkRating;
 extern money16 gParkEntranceFee;
+extern uint16 gParkSize;
+extern money16 gLandPrice;
+extern money16 gConstructionRightsPrice;
 
 extern uint32 gTotalAdmissions;
 extern money32 gTotalIncomeFromAdmissions;