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

Integrate gRides and gRideMeasurements

Browse Source
This commit is contained in:
Ted John
2016-09-11 00:05:32 +01:00
parent 4ec6b85ff7
commit 4a6b2f2ef2
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/addresses.h
View File

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

10
src/ride/ride.c
View File

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

7
src/ride/ride.h
View File

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