From 410376356d222e74a25cdc0ea26dadc104824aa6 Mon Sep 17 00:00:00 2001 From: Ted John Date: Wed, 8 Feb 2017 22:06:27 +0000 Subject: [PATCH] Remove scenario_load_rw, no longer used --- src/openrct2/rct2/S6Importer.cpp | 36 -------------------------------- src/openrct2/scenario/scenario.h | 1 - 2 files changed, 37 deletions(-) diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index c850a1c672..ea2f50f4c2 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -486,42 +486,6 @@ extern "C" return result; } - bool scenario_load_rw(SDL_RWops * rw) - { - bool result = false; - auto stream = FileStream(rw, FILE_MODE_OPEN); - auto s6Importer = new S6Importer(); - try - { - s6Importer->LoadFromStream(&stream, true); - s6Importer->Import(); - - game_fix_save_vars(); - sprite_position_tween_reset(); - result = true; - } - catch (ObjectLoadException) - { - gErrorType = ERROR_TYPE_FILE_LOAD; - gErrorStringId = STR_GAME_SAVE_FAILED; - } - catch (IOException) - { - gErrorType = ERROR_TYPE_FILE_LOAD; - gErrorStringId = STR_GAME_SAVE_FAILED; - } - catch (Exception) - { - gErrorType = ERROR_TYPE_FILE_LOAD; - gErrorStringId = STR_FILE_CONTAINS_INVALID_DATA; - } - delete s6Importer; - - gScreenAge = 0; - gLastAutoSaveUpdate = AUTOSAVE_PAUSE; - return result; - } - /** * * rct2: 0x00676053 diff --git a/src/openrct2/scenario/scenario.h b/src/openrct2/scenario/scenario.h index 7c4a2b4026..6456a5cd9a 100644 --- a/src/openrct2/scenario/scenario.h +++ b/src/openrct2/scenario/scenario.h @@ -376,7 +376,6 @@ extern uint32 gLastAutoSaveUpdate; extern const char *_scenarioFileName; -bool scenario_load_rw(SDL_RWops * rw); sint32 scenario_load(const char *path); sint32 scenario_load_and_play_from_path(const char *path); void scenario_begin();