From a610b372fdf38f747782d848f3dc1f6a258b7251 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Mon, 18 Apr 2016 15:35:33 +0200 Subject: [PATCH] Name addresses --- src/addresses.h | 4 ++++ src/interface/viewport.c | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/addresses.h b/src/addresses.h index bc235a15f4..3fcbe8f0d4 100644 --- a/src/addresses.h +++ b/src/addresses.h @@ -211,6 +211,10 @@ #define RCT2_ADDRESS_MAP_ARROW_Z 0x009DEA4C #define RCT2_ADDRESS_MAP_ARROW_DIRECTION 0x009DEA4E +#define RCT2_ADDRESS_PAINT_BOUNDBOX_OFFSET_X 0x009DEA52 +#define RCT2_ADDRESS_PAINT_BOUNDBOX_OFFSET_Y 0x009DEA54 +#define RCT2_ADDRESS_PAINT_BOUNDBOX_OFFSET_Z 0x009DEA56 + #define RCT2_ADDRESS_COMMAND_MAP_X 0x009DEA5E #define RCT2_ADDRESS_COMMAND_MAP_Y 0x009DEA60 #define RCT2_ADDRESS_COMMAND_MAP_Z 0x009DEA62 diff --git a/src/interface/viewport.c b/src/interface/viewport.c index 03e82c7aa4..916f350764 100644 --- a/src/interface/viewport.c +++ b/src/interface/viewport.c @@ -881,9 +881,9 @@ int sub_98199C( uint16 bound_box_offset_x, uint16 bound_box_offset_y, uint16 bound_box_offset_z, uint32 rotation ) { - RCT2_GLOBAL(0x009DEA52, uint16) = bound_box_offset_x; - RCT2_GLOBAL(0x009DEA54, uint16) = bound_box_offset_y; - RCT2_GLOBAL(0x009DEA56, uint16) = bound_box_offset_z; + RCT2_GLOBAL(RCT2_ADDRESS_PAINT_BOUNDBOX_OFFSET_X, uint16) = bound_box_offset_x; + RCT2_GLOBAL(RCT2_ADDRESS_PAINT_BOUNDBOX_OFFSET_Y, uint16) = bound_box_offset_y; + RCT2_GLOBAL(RCT2_ADDRESS_PAINT_BOUNDBOX_OFFSET_Z, uint16) = bound_box_offset_z; RCT2_CALLPROC_X(RCT2_ADDRESS(0x98199C, uint32_t)[get_current_rotation()], x_offset | (bound_box_length_z << 8), @@ -1130,9 +1130,9 @@ int sub_98198C( uint16 bound_box_offset_x, uint16 bound_box_offset_y, uint16 bound_box_offset_z, uint32 rotation ) { - RCT2_GLOBAL(0x009DEA52, uint16) = bound_box_offset_x; - RCT2_GLOBAL(0x009DEA54, uint16) = bound_box_offset_y; - RCT2_GLOBAL(0x009DEA56, uint16) = bound_box_offset_z; + RCT2_GLOBAL(RCT2_ADDRESS_PAINT_BOUNDBOX_OFFSET_X, uint16) = bound_box_offset_x; + RCT2_GLOBAL(RCT2_ADDRESS_PAINT_BOUNDBOX_OFFSET_Y, uint16) = bound_box_offset_y; + RCT2_GLOBAL(RCT2_ADDRESS_PAINT_BOUNDBOX_OFFSET_Z, uint16) = bound_box_offset_z; RCT2_CALLPROC_X(RCT2_ADDRESS(0x0098198C, uint32)[get_current_rotation()], x_offset | (bound_box_length_z << 8),