From 163e314379d4a09ac06f7780234c1a62879ebba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 7 Sep 2016 12:39:29 +0000 Subject: [PATCH] Remove unused or set-but-not-read variables --- src/core/String.cpp | 2 -- src/drawing/scrolling_text.c | 2 -- src/drawing/string.c | 5 ++--- src/interface/Theme.cpp | 4 ---- src/interface/console.c | 9 --------- src/interface/viewport_interaction.c | 2 -- src/interface/window.c | 3 --- src/network/network.cpp | 3 --- src/object/ObjectManager.cpp | 4 ---- src/object/ObjectRepository.cpp | 4 ++-- src/ride/coaster/junior_roller_coaster.c | 1 - src/ride/ride.c | 14 +++----------- src/ride/track_design.c | 5 +---- src/title.c | 3 --- src/windows/editor_object_selection.c | 2 -- src/windows/loadsave.c | 1 - src/windows/ride.c | 17 ----------------- src/windows/ride_construction.c | 3 --- src/windows/title_editor.c | 13 +++---------- src/windows/viewport.c | 4 +--- src/world/footpath.c | 9 --------- src/world/map.c | 1 - 22 files changed, 12 insertions(+), 99 deletions(-) diff --git a/src/core/String.cpp b/src/core/String.cpp index d563715934..c8f199b09d 100644 --- a/src/core/String.cpp +++ b/src/core/String.cpp @@ -230,7 +230,6 @@ namespace String utf8 * Trim(utf8 * str) { utf8 * firstNonWhitespace = nullptr; - utf8 * lastNonWhitespace = nullptr; codepoint_t codepoint; utf8 * ch = str; @@ -243,7 +242,6 @@ namespace String { firstNonWhitespace = ch; } - lastNonWhitespace = ch; } ch = nextCh; } diff --git a/src/drawing/scrolling_text.c b/src/drawing/scrolling_text.c index 10274464bf..5b14fcee24 100644 --- a/src/drawing/scrolling_text.c +++ b/src/drawing/scrolling_text.c @@ -83,13 +83,11 @@ static int scrolling_text_get_matching_or_oldest(rct_string_id stringId, uint16 { uint32 oldestId = 0xFFFFFFFF; int scrollIndex = -1; - rct_draw_scroll_text* oldestScroll = NULL; for (int i = 0; i < 32; i++) { rct_draw_scroll_text *scrollText = &gDrawScrollTextList[i]; if (oldestId >= scrollText->id) { oldestId = scrollText->id; scrollIndex = i; - oldestScroll = scrollText; } // If exact match return the matching index diff --git a/src/drawing/string.c b/src/drawing/string.c index c3069e45ec..34fa4690fc 100644 --- a/src/drawing/string.c +++ b/src/drawing/string.c @@ -339,7 +339,7 @@ void gfx_draw_string_centred(rct_drawpixelinfo *dpi, rct_string_id format, int x */ int gfx_draw_string_centred_wrapped(rct_drawpixelinfo *dpi, void *args, int x, int y, int width, rct_string_id format, int colour) { - int font_height, line_height, line_width, line_y, num_lines; + int font_height, line_height, line_y, num_lines; char* buffer = RCT2_ADDRESS(0x009C383D, char); if (gCurrentFontSpriteBase >= 0) { @@ -353,8 +353,7 @@ int gfx_draw_string_centred_wrapped(rct_drawpixelinfo *dpi, void *args, int x, i gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; - // line_width unused here - line_width = gfx_wrap_string(buffer, width, &num_lines, &font_height); + gfx_wrap_string(buffer, width, &num_lines, &font_height); line_height = font_get_line_height(font_height); if (*buffer == FORMAT_OUTLINE) { diff --git a/src/interface/Theme.cpp b/src/interface/Theme.cpp index 9404cafb0e..6b57efe7b1 100644 --- a/src/interface/Theme.cpp +++ b/src/interface/Theme.cpp @@ -849,12 +849,8 @@ extern "C" windowTheme = &desc->DefaultTheme; } - bool transparent = false; for (int i = 0; i < 6; i++) { window->colours[i] = windowTheme->Colours[i]; - if (windowTheme->Colours[i] & COLOUR_FLAG_TRANSLUCENT) { - transparent = true; - } } // Some windows need to be transparent even if the colours aren't. // There doesn't seem to be any side-effects for all windows being transparent diff --git a/src/interface/console.c b/src/interface/console.c index e0dbeb6dcd..240443b9bb 100644 --- a/src/interface/console.c +++ b/src/interface/console.c @@ -458,13 +458,9 @@ static int cc_rides(const utf8 **argv, int argc) return 0; } if (strcmp(argv[1], "type") == 0) { - int subtype; bool int_valid[3] = { 0 }; int ride_index = console_parse_int(argv[2], &int_valid[0]); int type = console_parse_int(argv[3], &int_valid[1]); - if (argc > 4) { - subtype = console_parse_int(argv[4], &int_valid[2]); - } if (!int_valid[0] || !int_valid[1]) { console_printf("This command expects integer arguments"); } else if (ride_index < 0) { @@ -472,7 +468,6 @@ static int cc_rides(const utf8 **argv, int argc) } else { gGameCommandErrorTitle = STR_CANT_CHANGE_OPERATING_MODE; int res = game_do_command(0, (type << 8) | 1, 0, (RIDE_SETTING_RIDE_TYPE << 8) | ride_index, GAME_COMMAND_SET_RIDE_SETTING, 0, 0); - rct_ride *ride = get_ride(ride_index); if (res == MONEY32_UNDEFINED) { console_printf("That didn't work"); } @@ -907,10 +902,6 @@ static int cc_load_object(const utf8 **argv, int argc) { gSilentResearch = false; } else if (objectType == OBJECT_TYPE_SCENERY_SETS) { - rct_scenery_set_entry *scenerySetEntry; - - scenerySetEntry = get_scenery_group_entry(groupIndex); - research_insert(true, groupIndex, RESEARCH_CATEGORY_SCENERYSET); gSilentResearch = true; diff --git a/src/interface/viewport_interaction.c b/src/interface/viewport_interaction.c index 6e8cd22b3e..e31a00e475 100644 --- a/src/interface/viewport_interaction.c +++ b/src/interface/viewport_interaction.c @@ -164,7 +164,6 @@ int viewport_interaction_left_click(int x, int y) int viewport_interaction_get_item_right(int x, int y, viewport_interaction_info *info) { rct_map_element *mapElement; - rct_sprite *sprite; rct_scenery_entry *sceneryEntry; rct_banner *banner; rct_ride *ride; @@ -183,7 +182,6 @@ int viewport_interaction_get_item_right(int x, int y, viewport_interaction_info info->x = mapCoord.x; info->y = mapCoord.y; mapElement = info->mapElement; - sprite = (rct_sprite*)mapElement; switch (info->type) { case VIEWPORT_INTERACTION_ITEM_SPRITE: diff --git a/src/interface/window.c b/src/interface/window.c index 79ea7b371d..5399efac9d 100644 --- a/src/interface/window.c +++ b/src/interface/window.c @@ -853,7 +853,6 @@ void window_close_all_except_class(rct_windowclass cls) rct_window *window_find_from_point(int x, int y) { rct_window *w; - rct_widget *widget; int widget_index; for (w = RCT2_LAST_WINDOW; w >= g_window_list; w--) { @@ -864,8 +863,6 @@ rct_window *window_find_from_point(int x, int y) widget_index = window_find_widget_from_point(w, x, y); if (widget_index == -1) continue; - - widget = &w->widgets[widget_index]; } return w; diff --git a/src/network/network.cpp b/src/network/network.cpp index 46798ad686..d1e7d08a6a 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -704,16 +704,13 @@ void Network::SaveGroups() } json_object_set_new(jsonGroupsCfg, "default_group", json_integer(default_group)); json_object_set_new(jsonGroupsCfg, "groups", jsonGroups); - bool result; try { Json::WriteToFile(path, jsonGroupsCfg, JSON_INDENT(4) | JSON_PRESERVE_ORDER); - result = true; } catch (Exception ex) { log_error("Unable to save %s: %s", path, ex.GetMessage()); - result = false; } json_decref(jsonGroupsCfg); diff --git a/src/object/ObjectManager.cpp b/src/object/ObjectManager.cpp index a0f6c8dfaa..849f12ceb2 100644 --- a/src/object/ObjectManager.cpp +++ b/src/object/ObjectManager.cpp @@ -110,8 +110,6 @@ public: bool LoadObjects(const rct_object_entry * entries, size_t count) override { - IObjectRepository * objectRepository = GetObjectRepository(); - // Find all the required objects size_t numRequiredObjects; auto requiredObjects = new const ObjectRepositoryItem *[OBJECT_ENTRY_COUNT]; @@ -159,8 +157,6 @@ public: Object * loadedObject = ori->LoadedObject; if (loadedObject != nullptr) { - size_t index = GetLoadedObjectIndex(loadedObject); - UnloadObject(loadedObject); numObjectsUnloaded++; } diff --git a/src/object/ObjectRepository.cpp b/src/object/ObjectRepository.cpp index 38d0bf31cc..be7aacf7c2 100644 --- a/src/object/ObjectRepository.cpp +++ b/src/object/ObjectRepository.cpp @@ -494,7 +494,7 @@ private: { if (fixChecksum) { - int realChecksum = object_calculate_checksum(entry, data, dataSize); + uint32 realChecksum = object_calculate_checksum(entry, data, dataSize); if (realChecksum != entry->checksum) { char objectName[9]; @@ -515,7 +515,7 @@ private: try { - int newRealChecksum = object_calculate_checksum(entry, newData, newDataSize); + uint32 newRealChecksum = object_calculate_checksum(entry, newData, newDataSize); if (newRealChecksum != entry->checksum) { Guard::Fail("CalculateExtraBytesToFixChecksum failed to fix checksum.", GUARD_LINE); diff --git a/src/ride/coaster/junior_roller_coaster.c b/src/ride/coaster/junior_roller_coaster.c index 81d08a2caf..6a9f3aa39f 100644 --- a/src/ride/coaster/junior_roller_coaster.c +++ b/src/ride/coaster/junior_roller_coaster.c @@ -1720,7 +1720,6 @@ static void junior_rc_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uin /* rct2: 0x00515629, 0x00514D22, 0x005151B9 */ static void paint_junior_rc_station_track(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { - rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)}; rct_ride * ride = get_ride(rideIndex); const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style]; uint32 imageId = entranceStyle->base_image_id; diff --git a/src/ride/ride.c b/src/ride/ride.c index ee0461fc78..483607346b 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -994,14 +994,8 @@ static int ride_create_ride(ride_list_item listItem) */ void ride_construct_new(ride_list_item listItem) { - int rideIndex; - game_command_callback = game_command_callback_ride_construct_new; - rideIndex = ride_create_ride(listItem); - - // moved to game_command_callback_ride_construct_new: - /*if (rideIndex != -1) - ride_construct(rideIndex);*/ + ride_create_ride(listItem); } /** @@ -1782,7 +1776,6 @@ int ride_modify(rct_xy_element *input) rct_xy_element mapElement, endOfTrackElement; rct_ride *ride; rct_ride_entry *rideType; - rct_window *constructionWindow; mapElement = *input; rideIndex = mapElement.element->properties.track.ride_index; @@ -1809,7 +1802,7 @@ int ride_modify(rct_xy_element *input) if (map_element_get_type(mapElement.element) == MAP_ELEMENT_TYPE_ENTRANCE) return ride_modify_entrance_or_exit(mapElement.element, mapElement.x, mapElement.y); - constructionWindow = ride_create_or_find_construction_window(rideIndex); + ride_create_or_find_construction_window(rideIndex); if (ride->type == RIDE_TYPE_MAZE) return ride_modify_maze(mapElement.element, mapElement.x, mapElement.y); @@ -2120,7 +2113,7 @@ static const rct_xy16 ride_spiral_slide_main_tile_offset[][4] = { */ static void ride_spiral_slide_update(rct_ride *ride) { - int i, x, y, z; + int i, x, y; rct_map_element *mapElement; rct_peep *peep; @@ -2145,7 +2138,6 @@ static void ride_spiral_slide_update(rct_ride *ride) x = ride->station_starts[i] & 0xFF; y = ride->station_starts[i] >> 8; - z = ride->station_heights[i]; mapElement = ride_get_station_start_track_element(ride, i); int rotation = map_element_get_direction(mapElement); diff --git a/src/ride/track_design.c b/src/ride/track_design.c index 6232992452..c0f043718c 100644 --- a/src/ride/track_design.c +++ b/src/ride/track_design.c @@ -45,10 +45,7 @@ typedef struct map_backup { uint8 current_rotation; } map_backup; -static const rct_object_entry DefaultMazeObjectEntry = { 0x80, { "HMAZE " }, 0 }; - rct_track_td6 *gActiveTrackDesign; -uint8 gTrackDesignPlaceFlags; bool gTrackDesignSceneryToggle; rct_xyz16 gTrackPreviewMin; rct_xyz16 gTrackPreviewMax; @@ -329,7 +326,7 @@ static void track_design_load_scenery_objects(rct_track_td6 *td6) // Load ride object rct_object_entry * rideEntry = &td6->vehicle_object; - void * loadedObject = object_manager_load_object(rideEntry); + object_manager_load_object(rideEntry); // Load scenery objects rct_td6_scenery_element *scenery = td6->scenery_elements; diff --git a/src/title.c b/src/title.c index 9bc02f219b..5c7eddc507 100644 --- a/src/title.c +++ b/src/title.c @@ -364,12 +364,9 @@ static void title_do_next_script_opcode() break; case TITLE_SCRIPT_LOAD: { - const uint8 *loadPtr; char *ch, filename[32], path[MAX_PATH]; char separator = platform_get_path_separator(); - loadPtr = _currentScript - 1; - // Get filename ch = filename; do { diff --git a/src/windows/editor_object_selection.c b/src/windows/editor_object_selection.c index 53baed9688..39405c9840 100644 --- a/src/windows/editor_object_selection.c +++ b/src/windows/editor_object_selection.c @@ -478,8 +478,6 @@ void window_editor_object_selection_open() */ static void setup_track_manager_objects() { - uint8 ride_list[128] = { 0 }; - int numObjects = (int)object_repository_get_items_count(); const ObjectRepositoryItem * items = object_repository_get_items(); for (int i = 0; i < numObjects; i++) { diff --git a/src/windows/loadsave.c b/src/windows/loadsave.c index 035802025a..04fbc80173 100644 --- a/src/windows/loadsave.c +++ b/src/windows/loadsave.c @@ -274,7 +274,6 @@ static bool browse(bool isSave, char *path) static void window_loadsave_mouseup(rct_window *w, int widgetIndex) { - int result = 0; char path[MAX_PATH]; bool isSave = (_type & 0x01) == LOADSAVETYPE_SAVE; diff --git a/src/windows/ride.c b/src/windows/ride.c index e6693c0d28..1db9bdb692 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -2225,7 +2225,6 @@ static void window_ride_show_open_dropdown(rct_window *w, rct_widget *widget) */ static void window_ride_main_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) { - rct_ride *ride = get_ride(w->number); switch (widgetIndex) { case WIDX_VIEW_DROPDOWN: window_ride_show_view_dropdown(w, widget); @@ -2703,10 +2702,6 @@ static void window_ride_main_paint(rct_window *w, rct_drawpixelinfo *dpi) */ static void window_ride_vehicle_mouseup(rct_window *w, int widgetIndex) { - rct_ride *ride; - - ride = get_ride(w->number); - switch (widgetIndex) { case WIDX_CLOSE: window_close(w); @@ -2835,15 +2830,9 @@ static void window_ride_vehicle_mousedown(int widgetIndex, rct_window *w, rct_wi */ static void window_ride_vehicle_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) { - rct_ride *ride; - rct_ride_entry *rideEntry; - if (dropdownIndex == -1) return; - ride = get_ride(w->number); - rideEntry = get_ride_entry_by_ride(ride); - switch (widgetIndex) { case WIDX_VEHICLE_TYPE_DROPDOWN: dropdownIndex = (gDropdownItemsArgs[dropdownIndex] >> 16) & 0xFFFF; @@ -4908,13 +4897,11 @@ static void window_ride_music_mousedown(int widgetIndex, rct_window *w, rct_widg */ static void window_ride_music_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) { - rct_ride *ride; uint8 musicStyle; if (widgetIndex != WIDX_MUSIC_DROPDOWN || dropdownIndex == -1) return; - ride = get_ride(w->number); musicStyle = window_ride_current_music_style_order[dropdownIndex]; gGameCommandErrorTitle = STR_CANT_CHANGE_OPERATING_MODE; game_do_command(0, (musicStyle << 8) | 1, 0, (7 << 8) | w->number, GAME_COMMAND_SET_RIDE_SETTING, 0, 0); @@ -5949,10 +5936,8 @@ static void window_ride_income_decrease_primary_price(rct_window *w) static void window_ride_income_increase_secondary_price(rct_window *w) { rct_ride *ride; - rct_ride_entry *ride_type; ride = get_ride(w->number); - ride_type = get_ride_entry(ride->subtype); money16 price = ride->price_secondary; if (price < MONEY(20, 00)) @@ -5968,10 +5953,8 @@ static void window_ride_income_increase_secondary_price(rct_window *w) static void window_ride_income_decrease_secondary_price(rct_window *w) { rct_ride *ride; - rct_ride_entry *ride_type; ride = get_ride(w->number); - ride_type = get_ride_entry(ride->subtype); money16 price = ride->price_secondary; if (price > MONEY(0, 00)) diff --git a/src/windows/ride_construction.c b/src/windows/ride_construction.c index 05443e77c5..df06875968 100644 --- a/src/windows/ride_construction.c +++ b/src/windows/ride_construction.c @@ -1265,7 +1265,6 @@ static void window_ride_construction_resize(rct_window *w) static void window_ride_construction_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) { rct_ride *ride = get_ride(_currentRideIndex); - int rideType; window_ride_construction_update_enabled_track_pieces(); switch (widgetIndex) { @@ -1327,7 +1326,6 @@ static void window_ride_construction_mousedown(int widgetIndex, rct_window *w, r break; case WIDX_SLOPE_DOWN_STEEP: sub_6C9627(); - rideType = _currentTrackCovered & 2 ? RideData4[ride->type].alternate_type : ride->type; if (is_track_enabled(TRACK_HELIX_SMALL)) { if (_currentTrackCurve == TRACK_CURVE_LEFT && _currentTrackBankEnd == TRACK_BANK_LEFT) { _currentTrackCurve = TRACK_ELEM_LEFT_HALF_BANKED_HELIX_DOWN_LARGE | 0x100; @@ -1425,7 +1423,6 @@ static void window_ride_construction_mousedown(int widgetIndex, rct_window *w, r break; case WIDX_SLOPE_UP_STEEP: sub_6C9627(); - rideType = _currentTrackCovered & 2 ? RideData4[ride->type].alternate_type : ride->type; if (is_track_enabled(TRACK_HELIX_SMALL)) { if (_currentTrackCurve == TRACK_CURVE_LEFT && _currentTrackBankEnd == TRACK_BANK_LEFT) { _currentTrackCurve = TRACK_ELEM_LEFT_HALF_BANKED_HELIX_UP_LARGE | 0x100; diff --git a/src/windows/title_editor.c b/src/windows/title_editor.c index 145c84b939..58ede26f0b 100644 --- a/src/windows/title_editor.c +++ b/src/windows/title_editor.c @@ -665,12 +665,9 @@ void window_title_editor_scrollmousedown(rct_window *w, int scrollIndex, int x, void window_title_editor_scrollmouseover(rct_window *w, int scrollIndex, int x, int y) { int index; - sint16 oldHighlightedIndex; index = y / ROW_HEIGHT; switch (w->selected_tab) { - oldHighlightedIndex = _window_title_editor_highlighted_index; - _window_title_editor_highlighted_index = -1; case WINDOW_TITLE_EDITOR_TAB_SAVES: if (index < gConfigTitleSequences.presets[gCurrentTitleSequence].num_saves) _window_title_editor_highlighted_index = (sint16)index; @@ -830,9 +827,8 @@ void window_title_editor_invalidate(rct_window *w) window_title_editor_widgets[WIDX_TITLE_EDITOR_SKIP].top = w->height - 32; window_title_editor_widgets[WIDX_TITLE_EDITOR_SKIP].bottom = w->height - 16; - int defaultPreset, playing, inTitle; + int playing, inTitle; - defaultPreset = (gCurrentTitleSequence < TITLE_SEQUENCE_DEFAULT_PRESETS); playing = (gCurrentTitleSequence == gCurrentPreviewTitleSequence) && ((gScreenFlags & SCREEN_FLAGS_TITLE_DEMO) == SCREEN_FLAGS_TITLE_DEMO); inTitle = ((gScreenFlags & SCREEN_FLAGS_TITLE_DEMO) == SCREEN_FLAGS_TITLE_DEMO); @@ -882,15 +878,14 @@ void window_title_editor_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int { char buffer[256]; bool selected, hover, error, inTitle; - int y, x, x2, width; + int y, x; gfx_fill_rect(dpi, dpi->x, dpi->y, dpi->x + dpi->width - 1, dpi->y + dpi->height - 1, ColourMapA[w->colours[1]].mid_light); title_sequence *title = &gConfigTitleSequences.presets[gCurrentTitleSequence]; inTitle = ((gScreenFlags & SCREEN_FLAGS_TITLE_DEMO) == SCREEN_FLAGS_TITLE_DEMO); - y = 0; x = 0; x2 = 0; width = 0; - width = w->widgets[WIDX_TITLE_EDITOR_LIST].right - w->widgets[WIDX_TITLE_EDITOR_LIST].left; + y = 0; x = 0; if (w->selected_tab == WINDOW_TITLE_EDITOR_TAB_SAVES) { for (int i = 0; i < title->num_saves; i++, y += ROW_HEIGHT) { @@ -921,8 +916,6 @@ void window_title_editor_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int } } else if (w->selected_tab == WINDOW_TITLE_EDITOR_TAB_SCRIPT) { - - x2 = 92; for (int i = 0; i < title->num_commands; i++, y += ROW_HEIGHT) { title_command *command = &title->commands[i]; selected = false; diff --git a/src/windows/viewport.c b/src/windows/viewport.c index 6dfb877a13..4aa667f815 100644 --- a/src/windows/viewport.c +++ b/src/windows/viewport.c @@ -98,7 +98,7 @@ void window_viewport_open() { rct_window *w, *mainWindow; rct_viewport *mainViewport; - int x, y, rotation; + int x, y; w = window_create_auto_pos( INITIAL_WIDTH, INITIAL_HEIGHT, @@ -114,8 +114,6 @@ void window_viewport_open() (1 << WIDX_LOCATE); w->number = _viewportNumber++; - rotation = get_current_rotation(); - // Create viewport viewport_create(w, w->x, w->y, w->width, w->height, 0, 128 * 32, 128 * 32, 0, 1, -1); mainWindow = window_get_main(); diff --git a/src/world/footpath.c b/src/world/footpath.c index 3f6feed7dd..1418b4d767 100644 --- a/src/world/footpath.c +++ b/src/world/footpath.c @@ -1502,15 +1502,6 @@ void sub_6A759F() */ static void footpath_unown(int x, int y, rct_map_element *pathElement) { - int ownershipUnk = 0; - int z = pathElement->base_height; - rct_map_element *surfaceElement = map_get_surface_element_at(x >> 5, y >> 5); - if (surfaceElement->base_height != z) { - z -= 2; - if (surfaceElement->base_height != z) { - ownershipUnk = (surfaceElement->properties.surface.ownership & 0xCF) >> 4; - } - } map_buy_land_rights(x, y, x, y, 6, 1); } diff --git a/src/world/map.c b/src/world/map.c index a20559e4fc..ff4db1f5a3 100644 --- a/src/world/map.c +++ b/src/world/map.c @@ -3169,7 +3169,6 @@ static bool map_place_fence_check_obstruction_with_track(rct_scenery_entry *wall int trackType = trackElement->properties.track.type; int sequence = trackElement->properties.track.sequence & 0x0F; - int typeAndSequence = (trackType << 4) | sequence; direction = (edge - trackElement->type) & 3; rct_ride *ride = get_ride(trackElement->properties.track.ride_index);