From 3d8b71ffbce270f9b0e127ee5b91c2480b6f3098 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Thu, 4 Aug 2016 01:09:33 +0200 Subject: [PATCH] Rename `gTrackDefinitions` to `TrackDefinitions` --- src/ride/cable_lift.c | 16 ++++++++-------- src/ride/ride.c | 16 ++++++++-------- src/ride/track.c | 14 +++++++------- src/ride/track.h | 4 ++-- src/ride/vehicle.c | 22 +++++++++++----------- src/windows/ride_construction.c | 28 ++++++++++++++-------------- src/world/map.c | 4 ++-- 7 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/ride/cable_lift.c b/src/ride/cable_lift.c index 40aef2330e..7bad947319 100644 --- a/src/ride/cable_lift.c +++ b/src/ride/cable_lift.c @@ -232,8 +232,8 @@ static bool sub_6DF01A_loop(rct_vehicle* vehicle) { const rct_vehicle_info *moveInfo = vehicle_get_move_info(vehicle->var_CD, vehicle->track_type, 0); uint16 trackTotalProgress = vehicle_get_move_info_size(vehicle->var_CD, vehicle->track_type); if (trackProgress >= trackTotalProgress) { - RCT2_GLOBAL(0x00F64E36, uint8) = gTrackDefinitions[trackType].vangle_end; - RCT2_GLOBAL(0x00F64E37, uint8) = gTrackDefinitions[trackType].bank_end; + RCT2_GLOBAL(0x00F64E36, uint8) = TrackDefinitions[trackType].vangle_end; + RCT2_GLOBAL(0x00F64E37, uint8) = TrackDefinitions[trackType].bank_end; rct_map_element* trackElement = map_get_track_element_at_of_type_seq( vehicle->track_x, @@ -254,8 +254,8 @@ static bool sub_6DF01A_loop(rct_vehicle* vehicle) { if (!track_block_get_next(&input, &output, &outputZ, &outputDirection)) return false; - if (gTrackDefinitions[output.element->properties.track.type].vangle_start != RCT2_GLOBAL(0x00F64E36, uint8) || - gTrackDefinitions[output.element->properties.track.type].bank_start != RCT2_GLOBAL(0x00F64E37, uint8)) + if (TrackDefinitions[output.element->properties.track.type].vangle_start != RCT2_GLOBAL(0x00F64E36, uint8) || + TrackDefinitions[output.element->properties.track.type].bank_start != RCT2_GLOBAL(0x00F64E37, uint8)) return false; vehicle->track_x = output.x; @@ -313,8 +313,8 @@ static bool sub_6DF21B_loop(rct_vehicle* vehicle) { if ((sint16)trackProgress == -1) { uint8 trackType = vehicle->track_type >> 2; - RCT2_GLOBAL(0x00F64E36, uint8) = gTrackDefinitions[trackType].vangle_start; - RCT2_GLOBAL(0x00F64E37, uint8) = gTrackDefinitions[trackType].bank_start; + RCT2_GLOBAL(0x00F64E36, uint8) = TrackDefinitions[trackType].vangle_start; + RCT2_GLOBAL(0x00F64E37, uint8) = TrackDefinitions[trackType].bank_start; rct_map_element* trackElement = map_get_track_element_at_of_type_seq( vehicle->track_x, @@ -333,8 +333,8 @@ static bool sub_6DF21B_loop(rct_vehicle* vehicle) { if (!track_block_get_previous(input.x, input.y, input.element, &output)) return false; - if (gTrackDefinitions[output.begin_element->properties.track.type].vangle_end != RCT2_GLOBAL(0x00F64E36, uint8) || - gTrackDefinitions[output.begin_element->properties.track.type].bank_end != RCT2_GLOBAL(0x00F64E37, uint8)) + if (TrackDefinitions[output.begin_element->properties.track.type].vangle_end != RCT2_GLOBAL(0x00F64E36, uint8) || + TrackDefinitions[output.begin_element->properties.track.type].bank_end != RCT2_GLOBAL(0x00F64E37, uint8)) return false; vehicle->track_x = output.begin_x; diff --git a/src/ride/ride.c b/src/ride/ride.c index 4e6193187a..d9c28f0cd6 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -1497,12 +1497,12 @@ void ride_construction_set_default_next_piece() if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE)) { curve = gFlatRideTrackCurveChain[trackType].next; - bank = gFlatRideTrackDefinitions[trackType].bank_end; - slope = gFlatRideTrackDefinitions[trackType].vangle_end; + bank = FlatRideTrackDefinitions[trackType].bank_end; + slope = FlatRideTrackDefinitions[trackType].vangle_end; } else { curve = gTrackCurveChain[trackType].next; - bank = gTrackDefinitions[trackType].bank_end; - slope = gTrackDefinitions[trackType].vangle_end; + bank = TrackDefinitions[trackType].bank_end; + slope = TrackDefinitions[trackType].vangle_end; } // Set track curve @@ -1548,12 +1548,12 @@ void ride_construction_set_default_next_piece() if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE)) { curve = gFlatRideTrackCurveChain[trackType].previous; - bank = gFlatRideTrackDefinitions[trackType].bank_start; - slope = gFlatRideTrackDefinitions[trackType].vangle_start; + bank = FlatRideTrackDefinitions[trackType].bank_start; + slope = FlatRideTrackDefinitions[trackType].vangle_start; } else { curve = gTrackCurveChain[trackType].previous; - bank = gTrackDefinitions[trackType].bank_start; - slope = gTrackDefinitions[trackType].vangle_start; + bank = TrackDefinitions[trackType].bank_start; + slope = TrackDefinitions[trackType].vangle_start; } // Set track curve diff --git a/src/ride/track.c b/src/ride/track.c index 73f18b3993..2b344ca77c 100644 --- a/src/ride/track.c +++ b/src/ride/track.c @@ -44,8 +44,8 @@ uint8 gTrackGroundFlags; * * rct2: 0x00997C9D */ -const rct_trackdefinition *gTrackDefinitions = (rct_trackdefinition*)0x00997C9D; -const rct_trackdefinition *gFlatRideTrackDefinitions = (rct_trackdefinition*)0x0099849D; +const rct_trackdefinition *TrackDefinitions = (rct_trackdefinition*)0x00997C9D; +const rct_trackdefinition *FlatRideTrackDefinitions = (rct_trackdefinition*)0x0099849D; // TODO This table is incorrect or at least missing 69 elements. There should be 256 in total! const rct_trackdefinition gTrackDefinitions_INCORRECT[] = { @@ -247,13 +247,13 @@ int track_is_connected_by_shape(rct_map_element *a, rct_map_element *b) int trackType, aBank, aAngle, bBank, bAngle; trackType = a->properties.track.type; - aBank = gTrackDefinitions[trackType].bank_end; - aAngle = gTrackDefinitions[trackType].vangle_end; + aBank = TrackDefinitions[trackType].bank_end; + aAngle = TrackDefinitions[trackType].vangle_end; aBank = track_get_actual_bank(a, aBank); trackType = b->properties.track.type; - bBank = gTrackDefinitions[trackType].bank_start; - bAngle = gTrackDefinitions[trackType].vangle_start; + bBank = TrackDefinitions[trackType].bank_start; + bAngle = TrackDefinitions[trackType].vangle_start; bBank = track_get_actual_bank(b, bBank); return aBank == bBank && aAngle == bAngle; @@ -1855,7 +1855,7 @@ int track_get_actual_bank_3(rct_vehicle *vehicle, rct_map_element *mapElement) int trackType = mapElement->properties.track.type; int rideType = get_ride(mapElement->properties.track.ride_index)->type; int trackColour = mapElement->properties.track.colour ^ colourThingToXor; - int bankStart = gTrackDefinitions[trackType].bank_start; + int bankStart = TrackDefinitions[trackType].bank_start; return track_get_actual_bank_2(rideType, trackColour, bankStart); } diff --git a/src/ride/track.h b/src/ride/track.h index f6445d9b1f..a27703e207 100644 --- a/src/ride/track.h +++ b/src/ride/track.h @@ -474,8 +474,8 @@ typedef struct track_circuit_iterator { bool looped; } track_circuit_iterator; -extern const rct_trackdefinition *gFlatRideTrackDefinitions; -extern const rct_trackdefinition *gTrackDefinitions; +extern const rct_trackdefinition *FlatRideTrackDefinitions; +extern const rct_trackdefinition *TrackDefinitions; extern uint8 gTrackGroundFlags; diff --git a/src/ride/vehicle.c b/src/ride/vehicle.c index 17b98fd62f..bfbb5a2d11 100644 --- a/src/ride/vehicle.c +++ b/src/ride/vehicle.c @@ -6570,7 +6570,7 @@ static bool loc_6DB38B(rct_vehicle *vehicle, rct_map_element *mapElement) // Get vangle int trackType = mapElement->properties.track.type; - int vangleStart = gTrackDefinitions[trackType].vangle_start; + int vangleStart = TrackDefinitions[trackType].vangle_start; // ? uint16 angleAndBank = vangleStart | (bankStart << 8); @@ -6989,8 +6989,8 @@ static void sub_6DBF3E(rct_vehicle *vehicle) static bool vehicle_update_track_motion_forwards_get_new_track(rct_vehicle *vehicle, uint16 trackType, rct_ride* ride, rct_ride_entry* rideEntry) { registers regs = { 0 }; - RCT2_GLOBAL(0x00F64E36, uint8) = gTrackDefinitions[trackType].vangle_end; - RCT2_GLOBAL(0x00F64E37, uint8) = gTrackDefinitions[trackType].bank_end; + RCT2_GLOBAL(0x00F64E36, uint8) = TrackDefinitions[trackType].vangle_end; + RCT2_GLOBAL(0x00F64E37, uint8) = TrackDefinitions[trackType].bank_end; rct_map_element *mapElement = map_get_track_element_at_of_type_seq( vehicle->track_x, vehicle->track_y, @@ -7369,8 +7369,8 @@ loc_6DB967: * rct2: 0x006DBAA6 */ static bool vehicle_update_track_motion_backwards_get_new_track(rct_vehicle *vehicle, uint16 trackType, rct_ride* ride, rct_ride_entry* rideEntry, uint16* progress) { - RCT2_GLOBAL(0x00F64E36, uint8) = gTrackDefinitions[trackType].vangle_start; - RCT2_GLOBAL(0x00F64E37, uint8) = gTrackDefinitions[trackType].bank_start; + RCT2_GLOBAL(0x00F64E36, uint8) = TrackDefinitions[trackType].vangle_start; + RCT2_GLOBAL(0x00F64E37, uint8) = TrackDefinitions[trackType].bank_start; rct_map_element* mapElement = map_get_track_element_at_of_type_seq( vehicle->track_x, vehicle->track_y, @@ -7419,9 +7419,9 @@ static bool vehicle_update_track_motion_backwards_get_new_track(rct_vehicle *veh } int trackColour = ((vehicle->update_flags >> 9) ^ mapElement->properties.track.colour) & 4; - int bank = gTrackDefinitions[trackType].bank_end; + int bank = TrackDefinitions[trackType].bank_end; bank = track_get_actual_bank_2(ride->type, trackColour, bank); - int vAngle = gTrackDefinitions[trackType].vangle_end; + int vAngle = TrackDefinitions[trackType].vangle_end; if (RCT2_GLOBAL(0x00F64E36, uint8) != vAngle || RCT2_GLOBAL(0x00F64E37, uint8) != bank ) { @@ -7759,8 +7759,8 @@ loc_6DC476: } uint16 trackType = vehicle->track_type >> 2; - RCT2_GLOBAL(0x00F64E36, uint8) = gTrackDefinitions[trackType].vangle_end; - RCT2_GLOBAL(0x00F64E37, uint8) = gTrackDefinitions[trackType].bank_end; + RCT2_GLOBAL(0x00F64E36, uint8) = TrackDefinitions[trackType].vangle_end; + RCT2_GLOBAL(0x00F64E37, uint8) = TrackDefinitions[trackType].bank_end; mapElement = map_get_track_element_at_of_type_seq( vehicle->track_x, vehicle->track_y, vehicle->track_z >> 3, trackType, 0 @@ -7977,8 +7977,8 @@ loc_6DCA9A: } trackType = vehicle->track_type >> 2; - RCT2_GLOBAL(0x00F64E36, uint8) = gTrackDefinitions[trackType].vangle_end; - RCT2_GLOBAL(0x00F64E37, uint8) = gTrackDefinitions[trackType].bank_end; + RCT2_GLOBAL(0x00F64E36, uint8) = TrackDefinitions[trackType].vangle_end; + RCT2_GLOBAL(0x00F64E37, uint8) = TrackDefinitions[trackType].bank_end; mapElement = map_get_track_element_at_of_type_seq( vehicle->track_x, vehicle->track_y, vehicle->track_z >> 3, trackType, 0 diff --git a/src/windows/ride_construction.c b/src/windows/ride_construction.c index 1bb962555b..e2467add29 100644 --- a/src/windows/ride_construction.c +++ b/src/windows/ride_construction.c @@ -2247,8 +2247,8 @@ static void window_ride_construction_draw_track_piece( z = 1024 + z; short bx = ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE) ? - RCT2_GLOBAL(0x009984A2 + trackType * 8, sint8) : - RCT2_GLOBAL(0x00997CA2 + trackType * 8, sint8); + FlatRideTrackDefinitions[trackType].special : + TrackDefinitions[trackType].special; z -= bx; int start_x = x; @@ -2904,8 +2904,8 @@ static void window_ride_construction_update_possible_ride_configurations() _numCurrentPossibleSpecialTrackPieces = 0; for (trackType = 0; trackType < 256; trackType++) { edx = ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE) ? - gFlatRideTrackDefinitions[trackType].type : - gTrackDefinitions[trackType].type; + FlatRideTrackDefinitions[trackType].type : + TrackDefinitions[trackType].type; if (edx == 0) continue; @@ -2921,19 +2921,19 @@ static void window_ride_construction_update_possible_ride_configurations() int slope, bank; if (_rideConstructionState == RIDE_CONSTRUCTION_STATE_FRONT || _rideConstructionState == RIDE_CONSTRUCTION_STATE_PLACE) { if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE)) { - slope = gFlatRideTrackDefinitions[trackType].vangle_start; - bank = gFlatRideTrackDefinitions[trackType].bank_start; + slope = FlatRideTrackDefinitions[trackType].vangle_start; + bank = FlatRideTrackDefinitions[trackType].bank_start; } else { - slope = gTrackDefinitions[trackType].vangle_start; - bank = gTrackDefinitions[trackType].bank_start; + slope = TrackDefinitions[trackType].vangle_start; + bank = TrackDefinitions[trackType].bank_start; } } else if (_rideConstructionState == RIDE_CONSTRUCTION_STATE_BACK) { if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE)) { - slope = gFlatRideTrackDefinitions[trackType].vangle_end; - bank = gFlatRideTrackDefinitions[trackType].bank_end; + slope = FlatRideTrackDefinitions[trackType].vangle_end; + bank = FlatRideTrackDefinitions[trackType].bank_end; } else { - slope = gTrackDefinitions[trackType].vangle_end; - bank = gTrackDefinitions[trackType].bank_end; + slope = TrackDefinitions[trackType].vangle_end; + bank = TrackDefinitions[trackType].bank_end; } } else { continue; @@ -2941,8 +2941,8 @@ static void window_ride_construction_update_possible_ride_configurations() if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE)) { if ( - gTrackDefinitions[trackType].type == TRACK_HELIX_SMALL || - gTrackDefinitions[trackType].type == TRACK_HELIX_LARGE + TrackDefinitions[trackType].type == TRACK_HELIX_SMALL || + TrackDefinitions[trackType].type == TRACK_HELIX_LARGE ) { if (bank != _previousTrackBankEnd) { if (_previousTrackBankEnd != TRACK_BANK_NONE) diff --git a/src/world/map.c b/src/world/map.c index baa89faaba..592abede19 100644 --- a/src/world/map.c +++ b/src/world/map.c @@ -3174,7 +3174,7 @@ static bool map_place_fence_check_obstruction_with_track(rct_scenery_entry *wall return false; } - if (gTrackDefinitions[trackType].bank_start == 0) { + if (TrackDefinitions[trackType].bank_start == 0) { if (!(RCT2_ADDRESS(0x009968BB, uint8)[trackType * 10] & 4)) { direction = (trackElement->type & 3) ^ 2; if (direction == edge) { @@ -3194,7 +3194,7 @@ static bool map_place_fence_check_obstruction_with_track(rct_scenery_entry *wall return false; } - if (gTrackDefinitions[trackType].bank_end != 0) { + if (TrackDefinitions[trackType].bank_end != 0) { return false; }