From 80381cfaa043d50bd507dd7ed5ca8e1d085e68ac Mon Sep 17 00:00:00 2001 From: Ted John Date: Sun, 3 Jul 2016 17:10:22 +0100 Subject: [PATCH] fix objects always been packed into saves --- src/rct2/S6Exporter.cpp | 2 +- src/rct2/S6Importer.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/rct2/S6Exporter.cpp b/src/rct2/S6Exporter.cpp index 77e97b2fb5..ec9e6e8a5d 100644 --- a/src/rct2/S6Exporter.cpp +++ b/src/rct2/S6Exporter.cpp @@ -89,7 +89,7 @@ void S6Exporter::SaveScenario(SDL_RWops *rw) void S6Exporter::Save(SDL_RWops * rw, bool isScenario) { _s6.header.type = isScenario ? S6_TYPE_SCENARIO : S6_TYPE_SAVEDGAME; - _s6.header.num_packed_objects = scenario_get_num_packed_objects_to_write(); + _s6.header.num_packed_objects = ExportObjects ? scenario_get_num_packed_objects_to_write() : 0; _s6.header.version = S6_RCT2_VERSION; _s6.header.magic_number = S6_MAGIC_NUMBER; diff --git a/src/rct2/S6Importer.cpp b/src/rct2/S6Importer.cpp index c8f7b13c7d..8088765d6c 100644 --- a/src/rct2/S6Importer.cpp +++ b/src/rct2/S6Importer.cpp @@ -372,7 +372,8 @@ void S6Importer::Import() // pad_13CE778 // Fix and set dynamic variables - if (!object_load_entries(_s6.objects)) { + if (!object_load_entries(_s6.objects)) + { throw ObjectLoadException(); } reset_loaded_objects();