From 060d41f5a0a4114f7fe7ebbd8cae0eaa055badcd Mon Sep 17 00:00:00 2001 From: Alexander Overvoorde Date: Wed, 28 Oct 2015 12:50:05 +0100 Subject: [PATCH] Replace raw addresses in RCT2_ADDRESS() with identifiers --- src/peep/peep.c | 6 +++--- src/ride/ride.c | 2 +- src/scenario.c | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/peep/peep.c b/src/peep/peep.c index b1a6979058..e5b8ece6da 100644 --- a/src/peep/peep.c +++ b/src/peep/peep.c @@ -8812,7 +8812,7 @@ static void peep_head_for_nearest_ride_with_flags(rct_peep *peep, int rideTypeFl if (peep->x == (sint16)0x8000) return; if (peep->guest_heading_to_ride_id != 255) { ride = GET_RIDE(peep->guest_heading_to_ride_id); - if (RCT2_ADDRESS(0x0097CF40, uint32)[ride->type * 2] & 0x03800000) { + if (RCT2_ADDRESS(RCT2_ADDRESS_RIDE_FLAGS, uint32)[ride->type * 2] & 0x03800000) { return; } } @@ -8835,7 +8835,7 @@ static void peep_head_for_nearest_ride_with_flags(rct_peep *peep, int rideTypeFl // Consider all rides in the park int i; FOR_ALL_RIDES(i, ride) { - if (RCT2_ADDRESS(0x0097CF40, uint32)[ride->type * 2] & rideTypeFlags) { + if (RCT2_ADDRESS(RCT2_ADDRESS_RIDE_FLAGS, uint32)[ride->type * 2] & rideTypeFlags) { RCT2_ADDRESS(0x00F1AD98, uint32)[i >> 5] |= (1 << (i & 0x1F)); } } @@ -8852,7 +8852,7 @@ static void peep_head_for_nearest_ride_with_flags(rct_peep *peep, int rideTypeFl int rideIndex = mapElement->properties.track.ride_index; ride = GET_RIDE(rideIndex); - if (RCT2_ADDRESS(0x0097CF40, uint32)[ride->type * 2] & rideTypeFlags) { + if (RCT2_ADDRESS(RCT2_ADDRESS_RIDE_FLAGS, uint32)[ride->type * 2] & rideTypeFlags) { RCT2_ADDRESS(0x00F1AD98, uint32)[rideIndex >> 5] |= (1 << (rideIndex & 0x1F)); } } while (!map_element_is_last_for_tile(mapElement++)); diff --git a/src/ride/ride.c b/src/ride/ride.c index 879639c970..fcbf42edbb 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -126,7 +126,7 @@ static const int RideInspectionInterval[] = { 10, 20, 30, 45, 60, 120, 0, 0 }; -rct_ride_type **gRideTypeList = RCT2_ADDRESS(0x009ACFA4, rct_ride_type*); +rct_ride_type **gRideTypeList = RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES, rct_ride_type*); rct_ride* g_ride_list = RCT2_ADDRESS(RCT2_ADDRESS_RIDE_LIST, rct_ride); // Static function declarations diff --git a/src/scenario.c b/src/scenario.c index d3a15000ab..a31ed2c710 100644 --- a/src/scenario.c +++ b/src/scenario.c @@ -817,7 +817,7 @@ int scenario_get_num_packed_objects_to_write() rct_object_entry_extended *entry = (rct_object_entry_extended*)0x00F3F03C; for (i = 0; i < 721; i++, entry++) { - if (RCT2_ADDRESS(0x009ACFA4, uint32)[i] == 0xFFFFFFFF || (entry->flags & 0xF0)) + if (RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES, uint32)[i] == 0xFFFFFFFF || (entry->flags & 0xF0)) continue; count++; @@ -835,7 +835,7 @@ int scenario_write_packed_objects(SDL_RWops* rw) int i; rct_object_entry_extended *entry = (rct_object_entry_extended*)0x00F3F03C; for (i = 0; i < 721; i++, entry++) { - if (RCT2_ADDRESS(0x009ACFA4, uint32)[i] == 0xFFFFFFFF || (entry->flags & 0xF0)) + if (RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES, uint32)[i] == 0xFFFFFFFF || (entry->flags & 0xF0)) continue; if (!write_object_file(rw, (rct_object_entry*)entry)) @@ -875,7 +875,7 @@ int scenario_write_available_objects(FILE *file) rct_object_entry_extended *srcEntry = (rct_object_entry_extended*)0x00F3F03C; rct_object_entry *dstEntry = (rct_object_entry*)buffer; for (i = 0; i < 721; i++) { - if (RCT2_ADDRESS(0x009ACFA4, uint32)[i] == 0xFFFFFFFF) + if (RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES, uint32)[i] == 0xFFFFFFFF) memset(dstEntry, 0xFF, sizeof(rct_object_entry)); else *dstEntry = *((rct_object_entry*)srcEntry); @@ -1021,10 +1021,10 @@ int scenario_save(SDL_RWops* rw, int flags) memcpy(&s6->info, (rct_s6_info*)0x0141F570, sizeof(rct_s6_info)); for (int i = 0; i < 721; i++) { - uint32 chunkPtr = RCT2_ADDRESS(0x009ACFA4, uint32)[i]; + uint32 chunkPtr = RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES, uint32)[i]; rct_object_entry_extended *entry = &(RCT2_ADDRESS(0x00F3F03C, rct_object_entry_extended)[i]); - if (RCT2_ADDRESS(0x009ACFA4, uint32)[i] == 0xFFFFFFFF) { + if (RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES, uint32)[i] == 0xFFFFFFFF) { memset(&s6->objects[i], 0xFF, sizeof(rct_object_entry)); } else { s6->objects[i] = *((rct_object_entry*)entry); @@ -1095,10 +1095,10 @@ int scenario_save_network(SDL_RWops* rw) memcpy(&s6->info, (rct_s6_info*)0x0141F570, sizeof(rct_s6_info)); for (int i = 0; i < 721; i++) { - uint32 chunkPtr = RCT2_ADDRESS(0x009ACFA4, uint32)[i]; + uint32 chunkPtr = RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES, uint32)[i]; rct_object_entry_extended *entry = &(RCT2_ADDRESS(0x00F3F03C, rct_object_entry_extended)[i]); - if (RCT2_ADDRESS(0x009ACFA4, uint32)[i] == 0xFFFFFFFF) { + if (RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES, uint32)[i] == 0xFFFFFFFF) { memset(&s6->objects[i], 0xFF, sizeof(rct_object_entry)); } else { s6->objects[i] = *((rct_object_entry*)entry);