From 5ef6816da6e000b5050c4d5064a15e645cfb59d2 Mon Sep 17 00:00:00 2001 From: Broxzier Date: Tue, 7 Feb 2017 01:17:14 +0100 Subject: [PATCH] Replace returns in switch with breaks [ci skip] --- src/openrct2/world/map.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/openrct2/world/map.c b/src/openrct2/world/map.c index f1eda61a7b..a918a8176c 100644 --- a/src/openrct2/world/map.c +++ b/src/openrct2/world/map.c @@ -5618,26 +5618,26 @@ void game_command_modify_tile(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx { const sint16 element_index = *edx; *ebx = tile_inspector_remove_element_at(x, y, element_index, flags); - return; + break; } case TILE_INSPECTOR_ANY_SWAP: { const sint32 first_index = *edx; const sint32 second_index = *edi; *ebx = tile_inspector_swap_elements_at(x, y, first_index, second_index, flags); - return; + break; } case TILE_INSPECTOR_ANY_INSERT_CORRUPT: { const sint16 element_index = *edx; *ebx = tile_inspector_insert_corrupt_at(x, y, element_index, flags); - return; + break; } case TILE_INSPECTOR_ANY_ROTATE: { const sint16 element_index = *edx; *ebx = tile_inspector_rotate_element_at(x, y, element_index, flags); - return; + break; } case TILE_INSPECTOR_ANY_PASTE: { @@ -5646,64 +5646,64 @@ void game_command_modify_tile(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx assert_struct_size(data, sizeof(element_to_paste)); memcpy(&element_to_paste, data, 8); *ebx = tile_inspector_paste_element_at(x, y, element_to_paste, flags); - return; + break; } case TILE_INSPECTOR_ANY_SORT: { *ebx = tile_inspector_sort_elements_at(x, y, flags); - return; + break; } case TILE_INSPECTOR_ANY_BASE_HEIGHT_OFFSET: { const sint16 element_index = *edx; const sint8 height_offset = *edi; *ebx = tile_inspector_any_base_height_offset(x, y, element_index, height_offset, flags); - return; + break; } case TILE_INSPECTOR_SURFACE_SHOW_PARK_FENCES: { const bool show_fences = *edx; *ebx = tile_inspector_surface_show_park_fences(x, y, show_fences, flags); - return; + break; } case TILE_INSPECTOR_SURFACE_TOGGLE_CORNER: { const sint32 corner_index = *edx; *ebx = tile_inspector_surface_toggle_corner(x, y, corner_index, flags); - return; + break; } case TILE_INSPECTOR_SURFACE_TOGGLE_DIAGONAL: { *ebx = tile_inspector_surface_toggle_diagonal(x, y, flags); - return; + break; } case TILE_INSPECTOR_PATH_SET_SLOPE: { const sint32 element_index = *edx; const bool sloped = *edi; *ebx = tile_inspector_path_set_sloped(x, y, element_index, sloped, flags); - return; + break; } case TILE_INSPECTOR_PATH_TOGGLE_EDGE: { const sint32 element_index = *edx; const sint32 edge_index = *edi; *ebx = tile_inspector_path_toggle_edge(x, y, element_index, edge_index, flags); - return; + break; } case TILE_INSPECTOR_FENCE_SET_SLOPE: { const sint32 element_index = *edx; const sint32 slope_value = *edi; *ebx = tile_inspector_fence_set_slope(x, y, element_index, slope_value, flags); - return; + break; } case TILE_INSPECTOR_TRACK_BASE_HEIGHT_OFFSET: { const sint32 element_index = *edx; const sint8 height_offset = *edi; *ebx = tile_inspector_track_base_height_offset(x, y, element_index, height_offset, flags); - return; + break; } case TILE_INSPECTOR_TRACK_SET_CHAIN: { @@ -5711,12 +5711,12 @@ void game_command_modify_tile(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx const bool entire_track_block = *edi; const bool set_chain = *ebp; *ebx = tile_inspector_track_set_chain(x, y, element_index, entire_track_block, set_chain, flags); - return; + break; } default: log_error("invalid instruction"); *ebx = MONEY32_UNDEFINED; - return; + break; } }