From 8fdce563ede0233fa10641ba03a72fc090bc5844 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Fri, 7 Feb 2020 18:13:59 +0100 Subject: [PATCH] Remove scenario_save_old() It seems like MSVC does not like it. --- src/openrct2/rct2/S6Exporter.cpp | 60 -------------------------------- 1 file changed, 60 deletions(-) diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 7359bad4c8..f6bbf0b434 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -1809,63 +1809,3 @@ enum : uint32_t S6_SAVE_FLAG_SCENARIO = 1 << 1, S6_SAVE_FLAG_AUTOMATIC = 1u << 31, }; - -/** - * - * rct2: 0x006754F5 - * @param flags bit 0: pack objects, 1: save as scenario - */ -[[maybe_unused]] static int32_t scenario_save_old(const utf8* path, int32_t flags) -{ - if (flags & S6_SAVE_FLAG_SCENARIO) - { - log_verbose("scenario_save(%s, SCENARIO)", path); - } - else - { - log_verbose("scenario_save(%s, SAVED GAME)", path); - } - - if (!(flags & S6_SAVE_FLAG_AUTOMATIC)) - { - window_close_construction_windows(); - } - - map_reorganise_elements(); - viewport_set_saved_view(); - - bool result = false; - auto s6exporter = new S6Exporter(); - try - { - if (flags & S6_SAVE_FLAG_EXPORT) - { - auto& objManager = OpenRCT2::GetContext()->GetObjectManager(); - s6exporter->ExportObjectsList = objManager.GetPackableObjects(); - } - s6exporter->RemoveTracklessRides = true; - s6exporter->Export(); - if (flags & S6_SAVE_FLAG_SCENARIO) - { - s6exporter->SaveScenario(path); - } - else - { - s6exporter->SaveGame(path); - } - result = true; - } - catch (const std::exception& e) - { - log_error("Unable to save park: '%s'", e.what()); - } - delete s6exporter; - - gfx_invalidate_screen(); - - if (result && !(flags & S6_SAVE_FLAG_AUTOMATIC)) - { - gScreenAge = 0; - } - return result; -}