From 55722a7ad41d72dd183d8284ab05a9d043188ddb Mon Sep 17 00:00:00 2001
From: Michael Steenbeek <m.o.steenbeek@gmail.com>
Date: Tue, 1 Sep 2020 20:33:52 +0200
Subject: [PATCH] Remove commented-out code (#12834)

---
 src/openrct2-ui/windows/EditorObjectSelection.cpp | 3 ---
 src/openrct2-ui/windows/InstallTrack.cpp          | 6 ------
 src/openrct2-ui/windows/ServerList.cpp            | 1 -
 src/openrct2-ui/windows/Themes.cpp                | 5 -----
 src/openrct2/cmdline/ConvertCommand.cpp           | 5 -----
 src/openrct2/title/TitleSequence.cpp              | 5 -----
 6 files changed, 25 deletions(-)

diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp
index 131e76db47..270b3408f1 100644
--- a/src/openrct2-ui/windows/EditorObjectSelection.cpp
+++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp
@@ -423,9 +423,6 @@ rct_window* window_editor_object_selection_open()
  */
 static void window_editor_object_selection_close(rct_window* w)
 {
-    // if (!(gScreenFlags & SCREEN_FLAGS_EDITOR))
-    //  return;
-
     unload_unselected_objects();
     editor_load_selected_objects();
     editor_object_flags_free();
diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp
index 7dfd8d42c5..3cbf0630a2 100644
--- a/src/openrct2-ui/windows/InstallTrack.cpp
+++ b/src/openrct2-ui/windows/InstallTrack.cpp
@@ -207,12 +207,6 @@ static void window_install_track_invalidate(rct_window* w)
     {
         w->pressed_widgets &= ~(1 << WIDX_TOGGLE_SCENERY);
     }
-
-    // if (w->track_list.var_482 != 0xFFFF) {
-    //  w->disabled_widgets &= ~(1 << WIDX_TRACK_PREVIEW);
-    // } else {
-    //  w->disabled_widgets |= (1 << WIDX_TRACK_PREVIEW);
-    // }
 }
 
 /**
diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp
index 5e024d2e25..f542079c02 100644
--- a/src/openrct2-ui/windows/ServerList.cpp
+++ b/src/openrct2-ui/windows/ServerList.cpp
@@ -438,7 +438,6 @@ static void window_server_list_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi
     {
         if (screenCoords.y >= dpi->y + dpi->height)
             continue;
-        // if (y + ITEM_HEIGHT < dpi->y) continue;
 
         const auto& serverDetails = _serverList.GetServer(i);
         bool highlighted = i == w->selected_list_item;
diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp
index dabb7276a0..92d25368f0 100644
--- a/src/openrct2-ui/windows/Themes.cpp
+++ b/src/openrct2-ui/windows/Themes.cpp
@@ -597,9 +597,6 @@ static void window_themes_dropdown(rct_window* w, rct_widgetindex widgetIndex, i
                 window_invalidate_all();
                 _colour_index_1 = -1;
                 _colour_index_2 = -1;
-
-                // if (gCurrentTheme >= 2)
-                //  themes_save_preset(gCurrentTheme);
             }
             break;
         case WIDX_THEMES_PRESETS_DROPDOWN:
@@ -708,8 +705,6 @@ void window_themes_scrollmousedown(rct_window* w, int32_t scrollIndex, const Scr
 
 void window_themes_scrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
 {
-    // if (_selected_tab == WINDOW_THEMES_TAB_SETTINGS)
-    //  return;
 }
 
 static void window_themes_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
diff --git a/src/openrct2/cmdline/ConvertCommand.cpp b/src/openrct2/cmdline/ConvertCommand.cpp
index 0a1d636489..4142903ffd 100644
--- a/src/openrct2/cmdline/ConvertCommand.cpp
+++ b/src/openrct2/cmdline/ConvertCommand.cpp
@@ -90,11 +90,6 @@ exitcode_t CommandLine::HandleCommandConvert(CommandLineArgEnumerator* enumerato
     WriteConvertFromAndToMessage(sourceFileType, destinationFileType);
 
     gOpenRCT2Headless = true;
-    // if (!openrct2_initialise())
-    // {
-    //     Console::Error::WriteLine("Error while initialising OpenRCT2.");
-    //     return EXITCODE_FAIL;
-    // }
 
     try
     {
diff --git a/src/openrct2/title/TitleSequence.cpp b/src/openrct2/title/TitleSequence.cpp
index 304499637f..6054343d16 100644
--- a/src/openrct2/title/TitleSequence.cpp
+++ b/src/openrct2/title/TitleSequence.cpp
@@ -457,12 +457,7 @@ static std::vector<TitleCommand> LegacyScriptRead(utf8* script, size_t scriptLen
             else if (_stricmp(token, "LOADSC") == 0)
             {
                 command.Type = TITLE_SCRIPT_LOADSC;
-                // Confirm the scenario exists
-                // source_desc desc;
-                // if (ScenarioSources::TryGetByName(part1, &desc))
-                //{
                 safe_strcpy(command.Scenario, part1, sizeof(command.Scenario));
-                //}
             }
         }
         if (command.Type != TITLE_SCRIPT_UNDEFINED)