mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-29 17:54:50 +01:00
Code Issues Releases Wiki Activity

refactor game command enum

Browse Source
This commit is contained in:
IntelOrca
2015-06-29 17:36:07 +01:00
parent 40ba6a3efa
commit 19edd8a3bb
8 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/windows/ride_construction.c
View File

@@ -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;

6
src/windows/staff.c
View File

@@ -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 */

8
src/windows/top_toolbar.c
View File

@@ -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;