From 19edd8a3bb390b088acf22149545f2a7de26db99 Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Mon, 29 Jun 2015 17:36:07 +0100 Subject: [PATCH] refactor game command enum --- src/editor.c | 2 +- src/game.h | 58 ++++++++++++++++----------------- src/ride/ride.c | 18 +++++----- src/ride/track.c | 10 +++--- src/windows/ride_construction.c | 2 +- src/windows/staff.c | 6 ++-- src/windows/top_toolbar.c | 8 ++--- src/world/map.c | 4 +-- 8 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/editor.c b/src/editor.c index 25761f88cb..46707139c2 100644 --- a/src/editor.c +++ b/src/editor.c @@ -250,7 +250,7 @@ static void set_all_land_owned() { int mapSize = RCT2_GLOBAL(RCT2_ADDRESS_MAP_SIZE, sint16); - game_do_command(64, 1, 64, 2, GAME_COMMAND_56, (mapSize - 2) * 32, (mapSize - 2) * 32); + game_do_command(64, 1, 64, 2, GAME_COMMAND_SET_LAND_OWNERSHIP, (mapSize - 2) * 32, (mapSize - 2) * 32); } /** diff --git a/src/game.h b/src/game.h index cdc1fb865a..e46e48c8f5 100644 --- a/src/game.h +++ b/src/game.h @@ -26,13 +26,13 @@ enum GAME_COMMAND { GAME_COMMAND_SET_RIDE_APPEARANCE, GAME_COMMAND_1, - GAME_COMMAND_TOGGLE_PAUSE, // 2 + GAME_COMMAND_TOGGLE_PAUSE, GAME_COMMAND_PLACE_TRACK, GAME_COMMAND_REMOVE_TRACK, - GAME_COMMAND_LOAD_OR_QUIT, // 5 - GAME_COMMAND_6, + GAME_COMMAND_LOAD_OR_QUIT, + GAME_COMMAND_CREATE_RIDE, GAME_COMMAND_DEMOLISH_RIDE, - GAME_COMMAND_SET_RIDE_STATUS, // 8 + GAME_COMMAND_SET_RIDE_STATUS, GAME_COMMAND_SET_RIDE_VEHICLES, GAME_COMMAND_SET_RIDE_NAME, GAME_COMMAND_SET_RIDE_SETTING, @@ -40,47 +40,47 @@ enum GAME_COMMAND { GAME_COMMAND_REMOVE_RIDE_ENTRANCE_OR_EXIT, GAME_COMMAND_REMOVE_SCENERY, GAME_COMMAND_PLACE_SCENERY, - GAME_COMMAND_16, - GAME_COMMAND_PLACE_PATH, // 17 + GAME_COMMAND_SET_WATER_HEIGHT, + GAME_COMMAND_PLACE_PATH, GAME_COMMAND_18, - GAME_COMMAND_REMOVE_PATH, // 19 - GAME_COMMAND_CHANGE_SURFACE_STYLE, //20 + GAME_COMMAND_REMOVE_PATH, + GAME_COMMAND_CHANGE_SURFACE_STYLE, GAME_COMMAND_SET_RIDE_PRICE, - GAME_COMMAND_22, //To do with text input + GAME_COMMAND_SET_PEEP_NAME, GAME_COMMAND_RAISE_LAND, GAME_COMMAND_LOWER_LAND, GAME_COMMAND_EDIT_LAND_SMOOTH, GAME_COMMAND_RAISE_WATER, GAME_COMMAND_LOWER_WATER, GAME_COMMAND_SET_BRAKES_SPEED, - GAME_COMMAND_HIRE_NEW_STAFF_MEMBER, // 29 - GAME_COMMAND_SET_STAFF_PATROL, //30 - GAME_COMMAND_FIRE_STAFF_MEMBER, // 31 - GAME_COMMAND_SET_STAFF_ORDER, // 32 + GAME_COMMAND_HIRE_NEW_STAFF_MEMBER, + GAME_COMMAND_SET_STAFF_PATROL, + GAME_COMMAND_FIRE_STAFF_MEMBER, + GAME_COMMAND_SET_STAFF_ORDER, GAME_COMMAND_SET_PARK_NAME, - GAME_COMMAND_SET_PARK_OPEN, // 34 - GAME_COMMAND_BUY_LAND_RIGHTS, // 35 + GAME_COMMAND_SET_PARK_OPEN, + GAME_COMMAND_BUY_LAND_RIGHTS, GAME_COMMAND_PLACE_PARK_ENTRANCE, GAME_COMMAND_REMOVE_PARK_ENTRANCE, - GAME_COMMAND_38, - GAME_COMMAND_SET_PARK_ENTRANCE_FEE, // 39 - GAME_COMMAND_SET_STAFF_COLOUR, // 40 + GAME_COMMAND_SET_MAZE_TRACK, + GAME_COMMAND_SET_PARK_ENTRANCE_FEE, + GAME_COMMAND_SET_STAFF_COLOUR, GAME_COMMAND_PLACE_FENCE, GAME_COMMAND_REMOVE_FENCE, GAME_COMMAND_PLACE_LARGE_SCENERY, GAME_COMMAND_REMOVE_LARGE_SCENERY, - GAME_COMMAND_SET_CURRENT_LOAN, // 45 - GAME_COMMAND_SET_RESEARCH_FUNDING, // 46 + GAME_COMMAND_SET_CURRENT_LOAN, + GAME_COMMAND_SET_RESEARCH_FUNDING, GAME_COMMAND_PLACE_TRACK_DESIGN, - GAME_COMMAND_START_MARKETING_CAMPAIGN, // 48 - GAME_COMMAND_49, - GAME_COMMAND_PLACE_BANNER, // New banner? (possibly scenery) - GAME_COMMAND_REMOVE_BANNER, // Remove banner - GAME_COMMAND_52, - GAME_COMMAND_53, - GAME_COMMAND_54, - GAME_COMMAND_55, - GAME_COMMAND_56, // Set land owned (possibly does other things) + GAME_COMMAND_START_MARKETING_CAMPAIGN, + GAME_COMMAND_PLACE_MAZE_DESIGN, + GAME_COMMAND_PLACE_BANNER, + GAME_COMMAND_REMOVE_BANNER, + GAME_COMMAND_SET_SCENERY_COLOUR, + GAME_COMMAND_SET_FENCE_COLOUR, + GAME_COMMAND_SET_LARGE_SCENERY_COLOUR, + GAME_COMMAND_SET_BANNER_COLOUR, + GAME_COMMAND_SET_LAND_OWNERSHIP, GAME_COMMAND_CLEAR_SCENERY }; diff --git a/src/ride/ride.c b/src/ride/ride.c index f6648495da..f2296e2d90 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -596,7 +596,7 @@ int ride_create_ride(ride_list_item listItem) RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, uint16) = 0x3DC; - esi = GAME_COMMAND_6; + esi = GAME_COMMAND_CREATE_RIDE; game_do_command_p(esi, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp); return ebx == MONEY32_UNDEFINED ? -1 : edi; } @@ -1029,10 +1029,10 @@ void sub_6C96C0() ride = GET_RIDE(rideIndex); if (ride->type == RIDE_TYPE_MAZE) { - game_do_command(x , 41 | (0 << 8), y , rideIndex | (2 << 8), GAME_COMMAND_38, z, 0); - game_do_command(x , 41 | (1 << 8), y + 16, rideIndex | (2 << 8), GAME_COMMAND_38, z, 0); - game_do_command(x + 16, 41 | (2 << 8), y + 16, rideIndex | (2 << 8), GAME_COMMAND_38, z, 0); - game_do_command(x + 16, 41 | (3 << 8), y , rideIndex | (2 << 8), GAME_COMMAND_38, z, 0); + game_do_command(x , 41 | (0 << 8), y , rideIndex | (2 << 8), GAME_COMMAND_SET_MAZE_TRACK, z, 0); + game_do_command(x , 41 | (1 << 8), y + 16, rideIndex | (2 << 8), GAME_COMMAND_SET_MAZE_TRACK, z, 0); + game_do_command(x + 16, 41 | (2 << 8), y + 16, rideIndex | (2 << 8), GAME_COMMAND_SET_MAZE_TRACK, z, 0); + game_do_command(x + 16, 41 | (3 << 8), y , rideIndex | (2 << 8), GAME_COMMAND_SET_MAZE_TRACK, z, 0); } else { direction = RCT2_GLOBAL(0x00F440CB, uint8); if (!(direction & 4)) { @@ -4289,14 +4289,14 @@ int ride_get_refund_price(int ride_id) ebx = oldebx; ebx |= 0 << 0; - RCT2_GLOBAL(0x00F4413A, int) += game_do_command_p(GAME_COMMAND_38, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp); + RCT2_GLOBAL(0x00F4413A, int) += game_do_command_p(GAME_COMMAND_SET_MAZE_TRACK, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp); ebx = oldebx; ebx |= 1 << 8; ecx = oldecx; ecx += 16; edx = oldedx; - RCT2_GLOBAL(0x00F4413A, int) += game_do_command_p(GAME_COMMAND_38, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp); + RCT2_GLOBAL(0x00F4413A, int) += game_do_command_p(GAME_COMMAND_SET_MAZE_TRACK, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp); ebx = oldebx; ebx |= 2 << 8; @@ -4305,7 +4305,7 @@ int ride_get_refund_price(int ride_id) ecx = oldecx; ecx += 16; edx = oldedx; - RCT2_GLOBAL(0x00F4413A, int) += game_do_command_p(GAME_COMMAND_38, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp); + RCT2_GLOBAL(0x00F4413A, int) += game_do_command_p(GAME_COMMAND_SET_MAZE_TRACK, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp); ebx = oldebx; ebx |= 3 << 8; @@ -4313,7 +4313,7 @@ int ride_get_refund_price(int ride_id) eax += 16; ecx = oldecx; edx = oldedx; - RCT2_GLOBAL(0x00F4413A, int) += game_do_command_p(GAME_COMMAND_38, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp); + RCT2_GLOBAL(0x00F4413A, int) += game_do_command_p(GAME_COMMAND_SET_MAZE_TRACK, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp); }else{ edx |= 0xFF << 8; edx &= ((map_element->properties.track.sequence & 0xF) << 8) | 0xFF; diff --git a/src/ride/track.c b/src/ride/track.c index 4c71ba126a..46a13ede5a 100644 --- a/src/ride/track.c +++ b/src/ride/track.c @@ -1444,7 +1444,7 @@ int track_place_maze(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint8** trac RCT2_GLOBAL(0x00141E9AE, rct_string_id) = 927; - cost = game_do_command(mapCoord.x, bl | (maze_entry & 0xFF) << 8, mapCoord.y, rideIndex | (maze_entry & 0xFF00), GAME_COMMAND_49, z, 0); + cost = game_do_command(mapCoord.x, bl | (maze_entry & 0xFF) << 8, mapCoord.y, rideIndex | (maze_entry & 0xFF00), GAME_COMMAND_PLACE_MAZE_DESIGN, z, 0); break; } @@ -1962,9 +1962,9 @@ int sub_6D2189(int* cost, uint8* ride_id){ int eax = 0, ebx, ecx = 0, edx, esi, edi = 0, ebp = 0; ebx = 41; edx = track_design->type | (entry_index << 8); - esi = GAME_COMMAND_6; + esi = GAME_COMMAND_CREATE_RIDE; - if (MONEY32_UNDEFINED == game_do_command_p(GAME_COMMAND_6, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp)) return 1; + if (MONEY32_UNDEFINED == game_do_command_p(GAME_COMMAND_CREATE_RIDE, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp)) return 1; // bh *ride_id = edi & 0xFF; @@ -3204,10 +3204,10 @@ void game_command_place_track_design(int* eax, int* ebx, int* ecx, int* edx, int _ebx = GAME_COMMAND_FLAG_APPLY, _ecx = 0, _edx = track_design->type | (entry_index << 8), - _esi = GAME_COMMAND_6, + _esi = GAME_COMMAND_CREATE_RIDE, _edi = 0, _ebp = 0; - game_do_command_p(GAME_COMMAND_6, &_eax, &_ebx, &_ecx, &_edx, &_esi, &_edi, &_ebp); + game_do_command_p(GAME_COMMAND_CREATE_RIDE, &_eax, &_ebx, &_ecx, &_edx, &_esi, &_edi, &_ebp); if (_ebx == MONEY32_UNDEFINED){ *ebx = MONEY32_UNDEFINED; RCT2_GLOBAL(RCT2_ADDRESS_NEXT_EXPENDITURE_TYPE, uint8) = 0; diff --git a/src/windows/ride_construction.c b/src/windows/ride_construction.c index f5adfefdb2..ec0d61aa02 100644 --- a/src/windows/ride_construction.c +++ b/src/windows/ride_construction.c @@ -2357,7 +2357,7 @@ money32 sub_6CA162(int rideIndex, int trackType, int trackDirection, int edxRS16 sub_6C96C0(); ride = GET_RIDE(rideIndex); if (ride->type == RIDE_TYPE_MAZE) { - result = game_do_command(x, 105 | (4 << 8), y, rideIndex | (trackType << 8) | (edxRS16 << 16), GAME_COMMAND_38, z, 0); + result = game_do_command(x, 105 | (4 << 8), y, rideIndex | (trackType << 8) | (edxRS16 << 16), GAME_COMMAND_SET_MAZE_TRACK, z, 0); if (result == MONEY32_UNDEFINED) return result; diff --git a/src/windows/staff.c b/src/windows/staff.c index 7e0fec7fb5..9a877cdda8 100644 --- a/src/windows/staff.c +++ b/src/windows/staff.c @@ -1223,9 +1223,9 @@ void window_staff_overview_text_input(){ RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_STRING_ID, uint16) = 2979; - game_do_command(1, 1, w->number, *text, GAME_COMMAND_22, *(text + 2), *(text + 1)); - game_do_command(2, 1, 0, *(text + 3), GAME_COMMAND_22, *(text + 5), *(text + 4)); - game_do_command(0, 1, 0, *(text + 6), GAME_COMMAND_22, *(text + 8), *(text + 7)); + game_do_command(1, 1, w->number, *text, GAME_COMMAND_SET_PEEP_NAME, *(text + 2), *(text + 1)); + game_do_command(2, 1, 0, *(text + 3), GAME_COMMAND_SET_PEEP_NAME, *(text + 5), *(text + 4)); + game_do_command(0, 1, 0, *(text + 6), GAME_COMMAND_SET_PEEP_NAME, *(text + 8), *(text + 7)); } /* rct2: 0x006BE5FC */ diff --git a/src/windows/top_toolbar.c b/src/windows/top_toolbar.c index 3ef453ca1c..d86e831383 100644 --- a/src/windows/top_toolbar.c +++ b/src/windows/top_toolbar.c @@ -785,7 +785,7 @@ static void repaint_scenery_tool_down(sint16 x, sint16 y, sint16 widgetIndex){ 1 | (map_element->type << 8), grid_y, map_element->base_height | (map_element->properties.scenery.type << 8), - GAME_COMMAND_52, + GAME_COMMAND_SET_SCENERY_COLOUR, 0, window_scenery_primary_colour | (window_scenery_secondary_colour << 8)); break; @@ -806,7 +806,7 @@ static void repaint_scenery_tool_down(sint16 x, sint16 y, sint16 widgetIndex){ 1 | (window_scenery_primary_colour << 8), grid_y, (map_element->type & MAP_ELEMENT_DIRECTION_MASK) | (map_element->base_height << 8), - GAME_COMMAND_53, + GAME_COMMAND_SET_FENCE_COLOUR, 0, window_scenery_secondary_colour | (window_scenery_tertiary_colour << 8)); break; @@ -826,7 +826,7 @@ static void repaint_scenery_tool_down(sint16 x, sint16 y, sint16 widgetIndex){ 1 | ((map_element->type & MAP_ELEMENT_DIRECTION_MASK) << 8), grid_y, map_element->base_height | ((map_element->properties.scenerymultiple.type >> 10) << 8), - GAME_COMMAND_54, + GAME_COMMAND_SET_LARGE_SCENERY_COLOUR, 0, window_scenery_primary_colour | (window_scenery_secondary_colour << 8)); break; @@ -847,7 +847,7 @@ static void repaint_scenery_tool_down(sint16 x, sint16 y, sint16 widgetIndex){ 1, grid_y, map_element->base_height | ((map_element->properties.banner.position & 0x3) << 8), - GAME_COMMAND_55, + GAME_COMMAND_SET_BANNER_COLOUR, 0, window_scenery_primary_colour | (window_scenery_secondary_colour << 8)); break; diff --git a/src/world/map.c b/src/world/map.c index b4faaf0096..279b71ded9 100644 --- a/src/world/map.c +++ b/src/world/map.c @@ -1668,7 +1668,7 @@ money32 raise_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) height = map_element->base_height + 2; } - money32 tileCost = game_do_command(xi, flags, yi, (max_height << 8) + height, GAME_COMMAND_16, 0, 0); + money32 tileCost = game_do_command(xi, flags, yi, (max_height << 8) + height, GAME_COMMAND_SET_WATER_HEIGHT, 0, 0); if (tileCost == MONEY32_UNDEFINED) return MONEY32_UNDEFINED; @@ -1731,7 +1731,7 @@ money32 lower_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) if (height < min_height) continue; height -= 2; - int tileCost = game_do_command(xi, flags, yi, (min_height << 8) + height, GAME_COMMAND_16, 0, 0); + int tileCost = game_do_command(xi, flags, yi, (min_height << 8) + height, GAME_COMMAND_SET_WATER_HEIGHT, 0, 0); if (tileCost == MONEY32_UNDEFINED) return MONEY32_UNDEFINED; cost += tileCost;