mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-22 23:33:04 +01:00
Code Issues Releases Wiki Activity

add missing breaks in dropdown switch for top toolbar

Browse Source
This commit is contained in:
IntelOrca
2014-10-14 03:38:46 +01:00
parent dd4895423f
commit dda40cb99a
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/windows/game_top_toolbar.c
View File

@@ -397,7 +397,7 @@ static void window_game_top_toolbar_mousedown(int widgetIndex, rct_window*w, rct
static void window_game_top_toolbar_dropdown() static void window_game_top_toolbar_dropdown()
{ {
short widgetIndex, dropdownIndex; short widgetIndex, dropdownIndex;
rct_window* w; rct_window* w, *mainWindow;
window_dropdown_get_registers(w, widgetIndex, dropdownIndex); window_dropdown_get_registers(w, widgetIndex, dropdownIndex);
@@ -416,7 +416,6 @@ static void window_game_top_toolbar_dropdown()
break; break;
case DDIDX_OPTIONS: // options case DDIDX_OPTIONS: // options
window_options_open(); window_options_open();
//RCT2_CALLPROC_EBPSAFE(0x006BAC5B);
break; break;
case DDIDX_SCREENSHOT: // screenshot case DDIDX_SCREENSHOT: // screenshot
RCT2_GLOBAL(RCT2_ADDRESS_SCREENSHOT_COUNTDOWN, sint8) = 10; RCT2_GLOBAL(RCT2_ADDRESS_SCREENSHOT_COUNTDOWN, sint8) = 10;
@@ -425,46 +424,48 @@ static void window_game_top_toolbar_dropdown()
game_do_command(0, 1, 0, 0, GAME_COMMAND_LOAD_OR_QUIT, 1, 0); game_do_command(0, 1, 0, 0, GAME_COMMAND_LOAD_OR_QUIT, 1, 0);
break; break;
} }
break;
case WIDX_VIEW_MENU: case WIDX_VIEW_MENU:
if (dropdownIndex == -1) dropdownIndex = RCT2_GLOBAL(0x9DEBA2, uint16); if (dropdownIndex == -1) dropdownIndex = RCT2_GLOBAL(0x9DEBA2, uint16);
w = window_get_main(); mainWindow = window_get_main();
if (w){ if (mainWindow) {
switch (dropdownIndex){ switch (dropdownIndex){
case DDIDX_UNDERGROUND_INSIDE: case DDIDX_UNDERGROUND_INSIDE:
w->viewport->flags ^= VIEWPORT_FLAG_UNDERGROUND_INSIDE; mainWindow->viewport->flags ^= VIEWPORT_FLAG_UNDERGROUND_INSIDE;
break; break;
case DDIDX_HIDE_BASE: case DDIDX_HIDE_BASE:
w->viewport->flags ^= VIEWPORT_FLAG_HIDE_BASE; mainWindow->viewport->flags ^= VIEWPORT_FLAG_HIDE_BASE;
break; break;
case DDIDX_HIDE_VERTICAL: case DDIDX_HIDE_VERTICAL:
w->viewport->flags ^= VIEWPORT_FLAG_HIDE_VERTICAL; mainWindow->viewport->flags ^= VIEWPORT_FLAG_HIDE_VERTICAL;
break; break;
case DDIDX_SEETHROUGH_RIDES: case DDIDX_SEETHROUGH_RIDES:
w->viewport->flags ^= VIEWPORT_FLAG_SEETHROUGH_RIDES; mainWindow->viewport->flags ^= VIEWPORT_FLAG_SEETHROUGH_RIDES;
break; break;
case DDIDX_SEETHROUGH_SCENARY: case DDIDX_SEETHROUGH_SCENARY:
w->viewport->flags ^= VIEWPORT_FLAG_SEETHROUGH_SCENERY; mainWindow->viewport->flags ^= VIEWPORT_FLAG_SEETHROUGH_SCENERY;
break; break;
case DDIDX_INVISIBLE_SUPPORTS: case DDIDX_INVISIBLE_SUPPORTS:
w->viewport->flags ^= VIEWPORT_FLAG_INVISIBLE_SUPPORTS; mainWindow->viewport->flags ^= VIEWPORT_FLAG_INVISIBLE_SUPPORTS;
break; break;
case DDIDX_INVISIBLE_PEEPS: case DDIDX_INVISIBLE_PEEPS:
w->viewport->flags ^= VIEWPORT_FLAG_INVISIBLE_PEEPS; mainWindow->viewport->flags ^= VIEWPORT_FLAG_INVISIBLE_PEEPS;
break; break;
case DDIDX_LAND_HEIGHTS: case DDIDX_LAND_HEIGHTS:
w->viewport->flags ^= VIEWPORT_FLAG_LAND_HEIGHTS; mainWindow->viewport->flags ^= VIEWPORT_FLAG_LAND_HEIGHTS;
break; break;
case DDIDX_TRACK_HEIGHTS: case DDIDX_TRACK_HEIGHTS:
w->viewport->flags ^= VIEWPORT_FLAG_TRACK_HEIGHTS; mainWindow->viewport->flags ^= VIEWPORT_FLAG_TRACK_HEIGHTS;
break; break;
case DDIDX_PATH_HEIGHTS: case DDIDX_PATH_HEIGHTS:
w->viewport->flags ^= VIEWPORT_FLAG_PATH_HEIGHTS; mainWindow->viewport->flags ^= VIEWPORT_FLAG_PATH_HEIGHTS;
break; break;
default: default:
return; return;
} }
window_invalidate(w); window_invalidate(w);
} }
break;
case WIDX_MAP: case WIDX_MAP:
if (dropdownIndex == -1) if (dropdownIndex == -1)
dropdownIndex = RCT2_GLOBAL(0x9DEBA2, uint16); dropdownIndex = RCT2_GLOBAL(0x9DEBA2, uint16);