mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Integrate 3 more park globals

Browse Source
This commit is contained in:
Ted John
2016-08-14 16:22:30 +01:00
parent 4e7bce99e6
commit 612de0e567
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/addresses.h
View File

@@ -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

3
src/world/park.c
View File

@@ -40,6 +40,9 @@ uint32 gParkNameArgs;
uint32 gParkFlags;
uint16 gParkRating;
money16 gParkEntranceFee;
uint16 gParkSize;
money16 gLandPrice;
money16 gConstructionRightsPrice;
uint32 gTotalAdmissions;
money32 gTotalIncomeFromAdmissions;

7
src/world/park.h
View File

@@ -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;