From fb7f0a21d2f695bdc4b21248e58ab4aaa6ac6864 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Thu, 9 Feb 2017 21:26:13 +0000
Subject: [PATCH] Remove game_load_sv6 that uses RWops

---
 src/openrct2/game.c              | 13 +---------
 src/openrct2/game.h              |  1 -
 src/openrct2/rct2/S6Importer.cpp | 43 --------------------------------
 3 files changed, 1 insertion(+), 56 deletions(-)

diff --git a/src/openrct2/game.c b/src/openrct2/game.c
index e20a8f21cd..7cde6ce85d 100644
--- a/src/openrct2/game.c
+++ b/src/openrct2/game.c
@@ -844,27 +844,16 @@ bool game_load_save(const utf8 *path)
 
 	safe_strcpy(gScenarioSavePath, path, MAX_PATH);
 
-	SDL_RWops* rw = SDL_RWFromFile(path, "rb");
-	if (rw == NULL) {
-		log_error("unable to open %s", path);
-		gErrorType = ERROR_TYPE_FILE_LOAD;
-		gGameCommandErrorTitle = STR_FILE_CONTAINS_INVALID_DATA;
-		return false;
-	}
-
 	uint32 extension_type = get_file_extension_type(path);
 	bool result = false;
-
 	if (extension_type == FILE_EXTENSION_SV6) {
-		result = game_load_sv6(rw);
+		result = game_load_sv6_path(path);
 	} else if (extension_type == FILE_EXTENSION_SV4) {
 		result = rct1_load_saved_game(path);
 		if (result)
 			gFirstTimeSave = 1;
 	}
 
-	SDL_RWclose(rw);
-
 	if (result) {
 		if (network_get_mode() == NETWORK_MODE_CLIENT) {
 			network_close();
diff --git a/src/openrct2/game.h b/src/openrct2/game.h
index 87336a8db6..6cdf14cfed 100644
--- a/src/openrct2/game.h
+++ b/src/openrct2/game.h
@@ -167,7 +167,6 @@ sint32 game_do_command_p(sint32 command, sint32 *eax, sint32 *ebx, sint32 *ecx,
 
 void game_load_or_quit_no_save_prompt();
 bool game_load_sv6_path(const char * path);
-bool game_load_sv6(SDL_RWops* rw);
 bool game_load_save(const utf8 *path);
 void game_load_init();
 void game_pause_toggle(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp);
diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
index ea2f50f4c2..a016180cc2 100644
--- a/src/openrct2/rct2/S6Importer.cpp
+++ b/src/openrct2/rct2/S6Importer.cpp
@@ -408,49 +408,6 @@ IParkImporter * ParkImporter::CreateS6()
 
 extern "C"
 {
-    /**
-     *
-     *  rct2: 0x00675E1B
-     */
-    bool game_load_sv6(SDL_RWops * rw)
-    {
-        if (!sawyercoding_validate_checksum(rw) && !gConfigGeneral.allow_loading_with_incorrect_checksum)
-        {
-            log_error("invalid checksum");
-
-            gErrorType = ERROR_TYPE_FILE_LOAD;
-            gGameCommandErrorTitle = STR_FILE_CONTAINS_INVALID_DATA;
-            return 0;
-        }
-
-        bool result = false;
-        auto stream = FileStream(rw, FILE_MODE_OPEN);
-        auto s6Importer = new S6Importer();
-        try
-        {
-            s6Importer->LoadFromStream(&stream, false);
-            s6Importer->Import();
-
-            game_fix_save_vars();
-            sprite_position_tween_reset();
-            result = true;
-        }
-        catch (const ObjectLoadException &ex)
-        {
-            Console::Error::WriteLine(ex.GetMessage());
-        }
-        catch (const Exception &ex)
-        {
-            Console::Error::WriteLine(ex.GetMessage());
-        }
-        delete s6Importer;
-
-        // #2407: Resetting screen time to not open a save prompt shortly after loading a park.
-        gScreenAge = 0;
-        gLastAutoSaveUpdate = AUTOSAVE_PAUSE;
-        return result;
-    }
-
     bool game_load_sv6_path(const char * path)
     {
         bool result = false;