From 6f756bb4587c8f21d7bcf62996d7187eb18a9dcc Mon Sep 17 00:00:00 2001 From: ZedThree Date: Mon, 28 Apr 2014 22:00:54 +0200 Subject: [PATCH] Replace variable addresses with named constants Done automatically with sed/unix --- src/game.c | 10 +++++----- src/gfx.c | 2 +- src/osinterface.c | 12 ++++++------ src/peep.c | 2 +- src/rct2.c | 4 ++-- src/scenario.c | 4 ++-- src/title.c | 2 +- src/window_clear_scenery.c | 4 ++-- src/window_dropdown.c | 2 +- src/window_game_bottom_toolbar.c | 8 ++++---- src/window_game_top_toolbar.c | 8 ++++---- src/window_land.c | 8 ++++---- src/window_main.c | 2 +- src/window_park.c | 4 ++-- src/window_water.c | 4 ++-- 15 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/game.c b/src/game.c index 7c94a2fb76..3aa242b296 100644 --- a/src/game.c +++ b/src/game.c @@ -128,7 +128,7 @@ void game_logic_update() { short stringId, _dx; - RCT2_GLOBAL(0x013628F4, sint32)++; + RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TICKS, sint32)++; RCT2_GLOBAL(0x00F663AC, sint32)++; RCT2_GLOBAL(0x009DEA66, sint16)++; if (RCT2_GLOBAL(0x009DEA66, sint16) == 0) @@ -321,8 +321,8 @@ static void game_handle_input_mouse(int x, int y, int state) RCT2_GLOBAL(RCT2_ADDRESS_INPUT_STATE, uint8) = INPUT_STATE_VIEWPORT_DRAG; RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_DRAG_LAST_X, sint16) = x; RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_DRAG_LAST_Y, sint16) = y; - RCT2_GLOBAL(0x009DE530, rct_windowclass) = w->classification; - RCT2_GLOBAL(0x009DE52E, rct_windownumber) = w->number; + RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_DRAG_WINDOWCLASS, rct_windowclass) = w->classification; + RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_DRAG_WINDOWNUMBER, rct_windownumber) = w->number; RCT2_GLOBAL(0x009DE540, sint16) = 0; // hide cursor // RCT2_CALLPROC_X(0x00407045, 0, 0, 0, 0, 0, 0, 0); @@ -384,7 +384,7 @@ static void game_handle_input_mouse(int x, int y, int state) dx = x - RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_DRAG_LAST_X, sint16); dy = y - RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_DRAG_LAST_Y, sint16); - w = window_find_by_id(RCT2_GLOBAL(0x009DE530, rct_windowclass), RCT2_GLOBAL(0x009DE52E, rct_windownumber)); + w = window_find_by_id(RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_DRAG_WINDOWCLASS, rct_windowclass), RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_DRAG_WINDOWNUMBER, rct_windownumber)); if (state == 0) { rct_viewport *viewport = w->viewport; RCT2_GLOBAL(0x009DE540, sint16) += RCT2_GLOBAL(0x009DE588, sint16); @@ -908,7 +908,7 @@ void game_handle_keyboard_input() // Handle mouse scrolling if (RCT2_GLOBAL(RCT2_ADDRESS_ON_TUTORIAL, uint8) == 0) - if (RCT2_GLOBAL(0x009AACBA, uint8) != 0) + if (RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_EDGE_SCROLLING, uint8) != 0) if (RCT2_GLOBAL(RCT2_ADDRESS_INPUT_STATE, uint8) == 1) if (!(RCT2_GLOBAL(RCT2_ADDRESS_PLACE_OBJECT_MODIFIER, uint8) & 3)) game_handle_edge_scroll(); diff --git a/src/gfx.c b/src/gfx.c index 8890e67b5d..7785422d87 100644 --- a/src/gfx.c +++ b/src/gfx.c @@ -239,7 +239,7 @@ void gfx_set_dirty_blocks(int left, int top, int right, int bottom) for (y = top; y <= bottom; y++) for (x = left; x <= right; x++) - screenDirtyBlocks[y * RCT2_GLOBAL(0x009ABDE8, sint32) + x] = 0xFF; + screenDirtyBlocks[y * RCT2_GLOBAL(RCT2_ADDRESS_DIRTY_BLOCK_COLUMNS, sint32) + x] = 0xFF; } /** diff --git a/src/osinterface.c b/src/osinterface.c index 594a398da2..7d11ff2ced 100644 --- a/src/osinterface.c +++ b/src/osinterface.c @@ -68,8 +68,8 @@ static void osinterface_create_window() RCT2_CALLPROC_EBPSAFE(0x0068352C); RCT2_CALLPROC_EBPSAFE(0x0068371D); - width = RCT2_GLOBAL(0x009AB4C2, sint16); - height = RCT2_GLOBAL(0x009AB4C4, sint16); + width = RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_RESOLUTION_WIDTH, sint16); + height = RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_RESOLUTION_HEIGHT, sint16); width = 640; height = 480; @@ -136,10 +136,10 @@ static void osinterface_resize(int width, int height) RCT2_GLOBAL(0x009ABDF0, uint8) = 6; RCT2_GLOBAL(0x009ABDF1, uint8) = 3; RCT2_GLOBAL(0x009ABDF2, uint8) = 1; - RCT2_GLOBAL(0x009ABDE4, sint16) = 64; - RCT2_GLOBAL(0x009ABDE6, sint16) = 8; - RCT2_GLOBAL(0x009ABDE8, sint32) = (width >> 6) + 1; - RCT2_GLOBAL(0x009ABDEC, sint32) = (height >> 3) + 1; + RCT2_GLOBAL(RCT2_ADDRESS_DIRTY_BLOCK_WIDTH, sint16) = 64; + RCT2_GLOBAL(RCT2_ADDRESS_DIRTY_BLOCK_HEIGHT, sint16) = 8; + RCT2_GLOBAL(RCT2_ADDRESS_DIRTY_BLOCK_COLUMNS, sint32) = (width >> 6) + 1; + RCT2_GLOBAL(RCT2_ADDRESS_DIRTY_BLOCK_ROWS, sint32) = (height >> 3) + 1; RCT2_CALLPROC_EBPSAFE(0x0066B905); // resize_gui() gfx_invalidate_screen(); diff --git a/src/peep.c b/src/peep.c index e50fb7c80a..0a16060ca2 100644 --- a/src/peep.c +++ b/src/peep.c @@ -60,7 +60,7 @@ void peep_update_all() peep = &(RCT2_ADDRESS(RCT2_ADDRESS_SPRITE_LIST, rct_sprite)[sprite_index].peep); sprite_index = peep->next; - if ((i & 0x7F) != (RCT2_GLOBAL(0x013628F4, uint32) & 0x7F)) { + if ((i & 0x7F) != (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TICKS, uint32) & 0x7F)) { RCT2_CALLPROC_X(0x0068FC1E, 0, 0, 0, 0, peep, 0, 0); } else { RCT2_CALLPROC_X(0x0068F41A, 0, 0, 0, i, peep, 0, 0); diff --git a/src/rct2.c b/src/rct2.c index 64fd70c1a9..df687dca0c 100644 --- a/src/rct2.c +++ b/src/rct2.c @@ -103,8 +103,8 @@ void rct2_init() RCT2_GLOBAL(0x00F663AC, int) = 0; RCT2_GLOBAL(0x009AC310, char*) = RCT2_GLOBAL(RCT2_ADDRESS_CMDLINE, char*); get_system_time(); - RCT2_GLOBAL(0x009DEA69, short) = RCT2_GLOBAL(0x01424304, short); - RCT2_GLOBAL(0x009DEA6B, short) = RCT2_GLOBAL(0x01424304, short); + RCT2_GLOBAL(0x009DEA69, short) = RCT2_GLOBAL(RCT2_ADDRESS_OS_TIME_DAY, short); + RCT2_GLOBAL(0x009DEA6B, short) = RCT2_GLOBAL(RCT2_ADDRESS_OS_TIME_DAY, short); rct2_init_directories(); rct2_startup_checks(); config_reset_shortcut_keys(); diff --git a/src/scenario.c b/src/scenario.c index 61b9108483..6eee3c4849 100644 --- a/src/scenario.c +++ b/src/scenario.c @@ -424,7 +424,7 @@ void scenario_load_and_play(rct_scenario_basic *scenario) uint8 _cl = (RCT2_GLOBAL(0x0138869E, sint16) & 0xFF) - mainWindow->viewport->zoom; mainWindow->viewport->zoom = RCT2_GLOBAL(0x0138869E, sint16) & 0xFF; - *((char*)(&RCT2_GLOBAL(0x0141E9E0, sint32))) = RCT2_GLOBAL(0x0138869E, sint16) >> 8; + *((char*)(&RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_ROTATION, sint32))) = RCT2_GLOBAL(0x0138869E, sint16) >> 8; if (_cl != 0) { if (_cl < 0) { _cl = -_cl; @@ -451,7 +451,7 @@ void scenario_load_and_play(rct_scenario_basic *scenario) RCT2_CALLPROC_EBPSAFE(0x00684AC3); RCT2_CALLPROC_EBPSAFE(0x006DFEE4); news_item_init_queue(); - if (RCT2_ADDRESS(0x013580F8, uint8) != OBJECTIVE_NONE) + if (RCT2_ADDRESS(RCT2_ADDRESS_OBJECTIVE_TYPE, uint8) != OBJECTIVE_NONE) window_park_objective_open(); RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_PARK_RATING, sint16) = calculate_park_rating(); diff --git a/src/title.c b/src/title.c index 6eb9fd77c7..5b447bca8a 100644 --- a/src/title.c +++ b/src/title.c @@ -172,7 +172,7 @@ static void title_update_showcase() { char _cl = (RCT2_GLOBAL(0x0138869E, sint16) & 0xFF) - w->viewport->zoom; w->viewport->zoom = RCT2_GLOBAL(0x0138869E, sint16) & 0xFF; - *((char*)(&RCT2_GLOBAL(0x0141E9E0, sint32))) = RCT2_GLOBAL(0x0138869E, sint16) >> 8; + *((char*)(&RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_ROTATION, sint32))) = RCT2_GLOBAL(0x0138869E, sint16) >> 8; if (_cl != 0) { if (_cl < 0) { _cl = -_cl; diff --git a/src/window_clear_scenery.c b/src/window_clear_scenery.c index 567a9358f8..061de23294 100644 --- a/src/window_clear_scenery.c +++ b/src/window_clear_scenery.c @@ -226,9 +226,9 @@ static int window_clear_scenery_should_close() { if (!(RCT2_GLOBAL(0x009DE518, uint32) & (1 << 3))) return 1; - if (RCT2_GLOBAL(0x009DE544, rct_windowclass) != WC_TOP_TOOLBAR) + if (RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, rct_windowclass) != WC_TOP_TOOLBAR) return 1; - if (RCT2_GLOBAL(0x009DE546, uint16) != 16) + if (RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint16) != 16) return 1; return 0; } diff --git a/src/window_dropdown.c b/src/window_dropdown.c index 0aecd65450..9050dd6c64 100644 --- a/src/window_dropdown.c +++ b/src/window_dropdown.c @@ -108,7 +108,7 @@ void window_dropdown_show_text(int x, int y, int extray, uint8 colour, uint8 fla max_string_width = 0; for (i = 0; i < num_items; i++) { format_string(buffer, gDropdownItemsFormat[i], (void*)(&gDropdownItemsArgs[i])); - RCT2_GLOBAL(0x013CE950, sint16) = 224; + RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE, sint16) = 224; string_width = gfx_get_string_width(buffer); max_string_width = max(string_width, max_string_width); } diff --git a/src/window_game_bottom_toolbar.c b/src/window_game_bottom_toolbar.c index 9723e30a65..c749c7d113 100644 --- a/src/window_game_bottom_toolbar.c +++ b/src/window_game_bottom_toolbar.c @@ -390,7 +390,7 @@ static void window_game_bottom_toolbar_draw_left_panel(rct_drawpixelinfo *dpi, r dpi, (*((int*)0x013CE952) < 0 ? 1391 : 1390), x, y - 3, - (RCT2_GLOBAL(0x009DE55C, rct_windowclass) == 2 && RCT2_GLOBAL(0x009DE560, sint32) == WIDX_MONEY ? 2 : w->colours[0] & 0x7F), + (RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_OVER_WINDOWCLASS, rct_windowclass) == 2 && RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_OVER_WIDGETINDEX, sint32) == WIDX_MONEY ? 2 : w->colours[0] & 0x7F), (void*)0x013CE952 ); y += 7; @@ -401,7 +401,7 @@ static void window_game_bottom_toolbar_draw_left_panel(rct_drawpixelinfo *dpi, r dpi, STR_NUM_GUESTS + RCT2_GLOBAL(0x013573FE, uint8), x, y, - (RCT2_GLOBAL(0x009DE55C, rct_windowclass) == 2 && RCT2_GLOBAL(0x009DE560, sint32) == WIDX_GUESTS ? 2 : w->colours[0] & 0x7F), + (RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_OVER_WINDOWCLASS, rct_windowclass) == 2 && RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_OVER_WIDGETINDEX, sint32) == WIDX_GUESTS ? 2 : w->colours[0] & 0x7F), (void*)0x01357844 ); @@ -426,7 +426,7 @@ static void window_game_bottom_toolbar_draw_park_rating(rct_drawpixelinfo *dpi, bar_width = (factor * 90) / 256; gfx_fill_rect_inset(dpi, x, y + 1, x + 93, y + 9, w->colours[1], 48); - if (!(colour & 0x80000000) || RCT2_GLOBAL(0x009DEA6E, uint8) != 0 || (RCT2_GLOBAL(0x013628F4, uint8) & 8)) { + if (!(colour & 0x80000000) || RCT2_GLOBAL(0x009DEA6E, uint8) != 0 || (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TICKS, uint8) & 8)) { if (bar_width > 2) gfx_fill_rect_inset(dpi, x + 2, y + 2, x + bar_width - 1, y + 8, colour & 0x7FFFFFFF, 0); } @@ -461,7 +461,7 @@ static void window_game_bottom_toolbar_draw_right_panel(rct_drawpixelinfo *dpi, 1845, x, y, - (RCT2_GLOBAL(0x009DE55C, rct_windowclass) == 2 && RCT2_GLOBAL(0x009DE560, sint32) == WIDX_DATE ? 2 : w->colours[0] & 0x7F), + (RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_OVER_WINDOWCLASS, rct_windowclass) == 2 && RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_OVER_WIDGETINDEX, sint32) == WIDX_DATE ? 2 : w->colours[0] & 0x7F), (void*)0x013CE952 ); diff --git a/src/window_game_top_toolbar.c b/src/window_game_top_toolbar.c index 92a7d4e7b3..acd1ab0180 100644 --- a/src/window_game_top_toolbar.c +++ b/src/window_game_top_toolbar.c @@ -174,7 +174,7 @@ static void window_game_top_toolbar_mouseup() break; case WIDX_CLEAR_SCENERY: - if ((RCT2_GLOBAL(0x009DE518, uint32) & (1 << 3)) && RCT2_GLOBAL(0x009DE544, uint8) == 1 && RCT2_GLOBAL(0x009DE546, uint16) == 16) { + if ((RCT2_GLOBAL(0x009DE518, uint32) & (1 << 3)) && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, uint8) == 1 && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint16) == 16) { RCT2_CALLPROC_EBPSAFE(0x006EE281); } else { show_gridlines(); @@ -185,7 +185,7 @@ static void window_game_top_toolbar_mouseup() } break; case WIDX_LAND: - if ((RCT2_GLOBAL(0x009DE518, uint32) & (1 << 3)) && RCT2_GLOBAL(0x009DE544, uint8) == 1 && RCT2_GLOBAL(0x009DE546, uint16) == 7) { + if ((RCT2_GLOBAL(0x009DE518, uint32) & (1 << 3)) && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, uint8) == 1 && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint16) == 7) { RCT2_CALLPROC_EBPSAFE(0x006EE281); } else { show_gridlines(); @@ -196,7 +196,7 @@ static void window_game_top_toolbar_mouseup() } break; case WIDX_WATER: - if ((RCT2_GLOBAL(0x009DE518, uint32) & (1 << 3)) && RCT2_GLOBAL(0x009DE544, uint8) == 1 && RCT2_GLOBAL(0x009DE546, uint16) == 8) { + if ((RCT2_GLOBAL(0x009DE518, uint32) & (1 << 3)) && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, uint8) == 1 && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint16) == 8) { RCT2_CALLPROC_EBPSAFE(0x006EE281); } else { show_gridlines(); @@ -378,7 +378,7 @@ static void window_game_top_toolbar_dropdown() RCT2_CALLPROC_EBPSAFE(0x006BAC5B); break; case 5: // screenshot - RCT2_GLOBAL(0x009DEA6D, sint8) = 10; + RCT2_GLOBAL(RCT2_ADDRESS_SCREENSHOT_COUNTDOWN, sint8) = 10; break; case 7: // quit game RCT2_CALLPROC_X(0x006677F2, 0, 1, 0, 0, 5, 1, 0); diff --git a/src/window_land.c b/src/window_land.c index 46db92465c..0c196b46f1 100644 --- a/src/window_land.c +++ b/src/window_land.c @@ -137,8 +137,8 @@ void window_land_open() RCT2_GLOBAL(RCT2_ADDRESS_SELECTED_TERRAIN_EDGE, uint8) = 255; _selectedFloorTexture = 0; _selectedWallTexture = 0; - RCT2_GLOBAL(0x009E2E1C, sint32) = 0x80000000; - RCT2_GLOBAL(0x009E2E20, sint32) = 0x80000000; + RCT2_GLOBAL(RCT2_ADDRESS_LAND_RAISE_COST, sint32) = 0x80000000; + RCT2_GLOBAL(RCT2_ADDRESS_LAND_LOWER_COST, sint32) = 0x80000000; window->colours[0] = 24; window->colours[1] = 24; window->colours[2] = 24; @@ -405,9 +405,9 @@ static int window_land_should_close() { if (!(RCT2_GLOBAL(0x009DE518, uint32) & (1 << 3))) return 1; - if (RCT2_GLOBAL(0x009DE544, rct_windowclass) != WC_TOP_TOOLBAR) + if (RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, rct_windowclass) != WC_TOP_TOOLBAR) return 1; - if (RCT2_GLOBAL(0x009DE546, sint16) != 7) + if (RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, sint16) != 7) return 1; return 0; } diff --git a/src/window_main.c b/src/window_main.c index ba79333998..2c95d7cbc8 100644 --- a/src/window_main.c +++ b/src/window_main.c @@ -63,7 +63,7 @@ void window_main_open() or word ptr [edi+12h], 400h } - RCT2_GLOBAL(0x0141E9E0, sint32) = 0; + RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_ROTATION, sint32) = 0; RCT2_GLOBAL(0x009E32B0, uint8) = 0; RCT2_GLOBAL(0x009E32B2, uint8) = 0; RCT2_GLOBAL(0x009E32B3, uint8) = 0; diff --git a/src/window_park.c b/src/window_park.c index 8480be7627..84550d2026 100644 --- a/src/window_park.c +++ b/src/window_park.c @@ -644,7 +644,7 @@ static void window_park_entrance_close() __asm mov w, esi if (RCT2_GLOBAL(0x009DE518, uint32) & (1 << 3)) - if (w->classification == RCT2_GLOBAL(0x009DE544, rct_windowclass) && w->number == RCT2_GLOBAL(0x009DE542, rct_windownumber)) + if (w->classification == RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, rct_windowclass) && w->number == RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWNUMBER, rct_windownumber)) RCT2_CALLPROC_EBPSAFE(0x006EE281); } @@ -1617,7 +1617,7 @@ void window_park_objective_open() } if (RCT2_GLOBAL(0x009DE518, uint32) & (1 << 3)) - if (window->classification == RCT2_GLOBAL(0x009DE544, rct_windowclass) && window->number == RCT2_GLOBAL(0x009DE542, rct_windownumber)) + if (window->classification == RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, rct_windowclass) && window->number == RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWNUMBER, rct_windownumber)) RCT2_CALLPROC_EBPSAFE(0x006EE281); window->viewport = NULL; diff --git a/src/window_water.c b/src/window_water.c index fa0a0c12c2..6b7eab58a5 100644 --- a/src/window_water.c +++ b/src/window_water.c @@ -232,9 +232,9 @@ static int window_water_should_close() { if (!(RCT2_GLOBAL(0x009DE518, uint32) & (1 << 3))) return 1; - if (RCT2_GLOBAL(0x009DE544, rct_windowclass) != WC_TOP_TOOLBAR) + if (RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, rct_windowclass) != WC_TOP_TOOLBAR) return 1; - if (RCT2_GLOBAL(0x009DE546, uint16) != 8) + if (RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint16) != 8) return 1; return 0; }