From e9269cb882cb864baf250a14f21fe8ffe7ec8b48 Mon Sep 17 00:00:00 2001 From: medsouz Date: Sat, 22 Aug 2015 12:03:40 -0400 Subject: [PATCH] Finish naming scenery.c addresses --- src/addresses.h | 7 +++++-- src/windows/scenery.c | 2 +- src/windows/top_toolbar.c | 26 +++++++++++++------------- src/world/scenery.c | 12 ++++++------ 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/addresses.h b/src/addresses.h index 3c96cec4e4..5533ef5ce3 100644 --- a/src/addresses.h +++ b/src/addresses.h @@ -351,19 +351,22 @@ #define RCT2_ADDRESS_SCENERY_COST 0x00F64EB4 #define RCT2_ADDRESS_SCENERY_MAP_ELEMENT 0x00F64EBC +#define RCT2_ADDRESS_SCENERY_ROTATION 0x00F64EC0 #define RCT2_ADDRESS_GHOST_SCENERY_X 0x00F64EC4 #define RCT2_ADDRESS_GHOST_SCENERY_Y 0x00F64EC6 #define RCT2_ADDRESS_GHOST_SCENERY_Z 0x00F64F09 #define RCT2_ADDRESS_SCENERY_MAP_ELEMENT_TYPE 0x00F64F0C #define RCT2_ADDRESS_GHOST_SCENERY_TYPE 0x00F64F0D - +#define RCT2_ADDRESS_SCENERY_TARGET_PATH_INCLINE 0x00F64F0F +#define RCT2_ADDRESS_GHOST_SCENERY_PATH_OBJECT_TYPE 0x00F64EAC #define RCT2_ADDRESS_CTRL_PRESS_Z_COORDINATE 0x00F64ECC #define RCT2_ADDRESS_SHIFT_PRESS_X_COORDINATE 0x00F64ECE #define RCT2_ADDRESS_SHIFT_PRESS_Y_COORDINATE 0x00F64ED0 #define RCT2_ADDRESS_SHIFT_PRESS_Z_VECTOR 0x00F64ED2 #define RCT2_ADDRESS_SCENERY_Z_COORDINATE 0x00F64ED4 #define RCT2_ADDRESS_SCENERY_SELECTED_OBJECT 0x00F64EDA - +#define RCT2_ADDRESS_SCENERY_TARGET_PATH_TYPE 0x00F64F10 +#define RCT2_ADDRESS_GHOST_SCENERY_WALL_ROTATION 0x00F64F11 #define RCT2_ADDRESS_SCENERY_TOOL_CTRL_PRESSED 0x00F64F12 #define RCT2_ADDRESS_SCENERY_TOOL_SHIFT_PRESSED 0x00F64F13 diff --git a/src/windows/scenery.c b/src/windows/scenery.c index ea6a4388a2..b7c132a489 100644 --- a/src/windows/scenery.c +++ b/src/windows/scenery.c @@ -472,7 +472,7 @@ void window_scenery_open() window_push_others_below(window); RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_TYPE, uint8) = 0; RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_COST, uint32) = MONEY32_UNDEFINED; - RCT2_GLOBAL(0x00F64EC0, uint16) = 0; + RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_ROTATION, uint16) = 0; window_scenery_is_repaint_scenery_tool_on = 0; // repaint colored scenery tool state window_scenery_is_build_cluster_tool_on = 0; // build cluster tool state diff --git a/src/windows/top_toolbar.c b/src/windows/top_toolbar.c index 9aa804c3b6..16d838b2c2 100644 --- a/src/windows/top_toolbar.c +++ b/src/windows/top_toolbar.c @@ -1434,8 +1434,8 @@ static void window_top_toolbar_scenery_tool_down(short x, short y, rct_window* w cur_grid_y += ((scenario_rand() % 16) - 8) * 32; if (!(scenery->small_scenery.flags & SMALL_SCENERY_FLAG4)){ - RCT2_GLOBAL(0x00F64EC0, uint16)++; - RCT2_GLOBAL(0x00F64EC0, uint16) &= 3; + RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_ROTATION, uint16)++; + RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_ROTATION, uint16) &= 3; } } @@ -1460,7 +1460,7 @@ static void window_top_toolbar_scenery_tool_down(short x, short y, rct_window* w RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_STRING_ID, rct_string_id) = 1161; - int cost = game_do_command(cur_grid_x, ebx, cur_grid_y, parameter_2, GAME_COMMAND_PLACE_SCENERY, RCT2_GLOBAL(0x00F64EC0, uint8) | (parameter_3 & 0xFFFF0000), RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_Z_COORDINATE, sint16)); + int cost = game_do_command(cur_grid_x, ebx, cur_grid_y, parameter_2, GAME_COMMAND_PLACE_SCENERY, RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_ROTATION, uint8) | (parameter_3 & 0xFFFF0000), RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_Z_COORDINATE, sint16)); RCT2_GLOBAL(0x009A8C29, uint8) &= ~1; @@ -2090,7 +2090,7 @@ money32 try_place_ghost_scenery(rct_xy16 map_tile, uint32 parameter_1, uint32 pa RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_X, sint16) = map_tile.x; RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Y, sint16) = map_tile.y; - RCT2_GLOBAL(0x00F64EC0, uint16) = (uint16)(parameter_3 & 0xFFFF); + RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_ROTATION, uint16) = (uint16)(parameter_3 & 0xFFFF); RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_SELECTED_OBJECT, sint16) = selected_tab; mapElement = RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_MAP_ELEMENT, rct_map_element*); @@ -2123,9 +2123,9 @@ money32 try_place_ghost_scenery(rct_xy16 map_tile, uint32 parameter_1, uint32 pa RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_X, sint16) = map_tile.x; RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Y, sint16) = map_tile.y; RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Z, uint8) = (parameter_2 & 0xFF); - RCT2_GLOBAL(0x00F64F0F, uint8) = ((parameter_1 >> 8) & 0xFF); - RCT2_GLOBAL(0x00F64F10, uint8) = ((parameter_2 >> 8) & 0xFF); - RCT2_GLOBAL(0x00F64EAC, uint32) = parameter_3; + RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_TARGET_PATH_INCLINE, uint8) = ((parameter_1 >> 8) & 0xFF); + RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_TARGET_PATH_TYPE, uint8) = ((parameter_2 >> 8) & 0xFF); + RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_PATH_OBJECT_TYPE, uint32) = parameter_3; RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_TYPE, uint8) |= (1 << 1); break; @@ -2146,7 +2146,7 @@ money32 try_place_ghost_scenery(rct_xy16 map_tile, uint32 parameter_1, uint32 pa RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_X, sint16) = map_tile.x; RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Y, sint16) = map_tile.y; - RCT2_GLOBAL(0x00F64F11, uint8) = (parameter_2 & 0xFF); + RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_WALL_ROTATION, uint8) = (parameter_2 & 0xFF); mapElement = RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_MAP_ELEMENT, rct_map_element*); RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Z, uint8) = mapElement->base_height; @@ -2170,7 +2170,7 @@ money32 try_place_ghost_scenery(rct_xy16 map_tile, uint32 parameter_1, uint32 pa RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_X, sint16) = map_tile.x; RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Y, sint16) = map_tile.y; - RCT2_GLOBAL(0x00F64EC0, uint8) = ((parameter_1 >> 8) & 0xFF); + RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_ROTATION, uint8) = ((parameter_1 >> 8) & 0xFF); mapElement = RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_MAP_ELEMENT, rct_map_element*); RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Z, uint8) = mapElement->base_height; @@ -2202,7 +2202,7 @@ money32 try_place_ghost_scenery(rct_xy16 map_tile, uint32 parameter_1, uint32 pa RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_X, sint16) = map_tile.x; RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Y, sint16) = map_tile.y; RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Z, uint8) = (parameter_2 & 0xFF); - RCT2_GLOBAL(0x00F64EC0, uint8) = ((parameter_2 >> 8) & 0xFF); + RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_ROTATION, uint8) = ((parameter_2 >> 8) & 0xFF); RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_TYPE, uint8) |= (1 << 4); break; } @@ -2342,7 +2342,7 @@ void top_toolbar_tool_update_scenery(sint16 x, sint16 y){ if ((RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_TYPE, uint8) & (1 << 2)) && mapTile.x == RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_X, sint16) && mapTile.y == RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Y, sint16) && - (parameter2 & 0xFF) == RCT2_GLOBAL(0x00F64F11, uint8) && + (parameter2 & 0xFF) == RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_WALL_ROTATION, uint8) && RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_Z_COORDINATE, sint16) == RCT2_GLOBAL(0x00F64F0A, sint16) ){ return; @@ -2350,7 +2350,7 @@ void top_toolbar_tool_update_scenery(sint16 x, sint16 y){ scenery_remove_ghost_tool_placement(); - RCT2_GLOBAL(0x00F64F11, uint8) = (parameter2 & 0xFF); + RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_WALL_ROTATION, uint8) = (parameter2 & 0xFF); RCT2_GLOBAL(0x00F64F0A, sint16) = RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_Z_COORDINATE, sint16); bl = 1; @@ -2450,7 +2450,7 @@ void top_toolbar_tool_update_scenery(sint16 x, sint16 y){ mapTile.x == RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_X, sint16) && mapTile.y == RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Y, sint16) && (parameter2 & 0xFF) == RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Z, uint8) && - ((parameter2 >> 8) & 0xFF) == RCT2_GLOBAL(0x00F64EC0, uint8)){ + ((parameter2 >> 8) & 0xFF) == RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_ROTATION, uint8)){ return; } diff --git a/src/world/scenery.c b/src/world/scenery.c index dae85db385..5075173d7f 100644 --- a/src/world/scenery.c +++ b/src/world/scenery.c @@ -147,11 +147,11 @@ void scenery_remove_ghost_tool_placement(){ game_do_command( x, - 233 | (RCT2_GLOBAL(0x00F64F0F, uint8) << 8), + 233 | (RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_TARGET_PATH_INCLINE, uint8) << 8), y, - z | (RCT2_GLOBAL(0x00F64F10, uint8) << 8), + z | (RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_TARGET_PATH_TYPE, uint8) << 8), GAME_COMMAND_PLACE_PATH, - RCT2_GLOBAL(0x00F64EAC, uint32) & 0xFFFF0000, + RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_PATH_OBJECT_TYPE, uint32) & 0xFFFF0000, 0); break; } while (!map_element_is_last_for_tile(map_element++)); @@ -163,7 +163,7 @@ void scenery_remove_ghost_tool_placement(){ x, 105 | (RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_MAP_ELEMENT_TYPE, uint8) << 8), y, - RCT2_GLOBAL(0x00F64F11, uint8) |(z << 8), + RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_WALL_ROTATION, uint8) |(z << 8), GAME_COMMAND_REMOVE_FENCE, 0, 0); @@ -173,7 +173,7 @@ void scenery_remove_ghost_tool_placement(){ RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_TYPE, uint8) &= ~(1 << 3); game_do_command( x, - 105 | (RCT2_GLOBAL(0x00F64EC0 /* rotation? */, uint8) << 8), + 105 | (RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_ROTATION, uint8) << 8), y, z, GAME_COMMAND_REMOVE_LARGE_SCENERY, @@ -187,7 +187,7 @@ void scenery_remove_ghost_tool_placement(){ x, 105, y, - z | (RCT2_GLOBAL(0x00F64EC0, uint8) << 8), + z | (RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_ROTATION, uint8) << 8), GAME_COMMAND_REMOVE_BANNER, 0, 0);