diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 189c8aa613..56a0db7141 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1434,7 +1434,6 @@ private: } // Awards - award_reset(); for (sint32 i = 0; i < RCT12_MAX_AWARDS; i++) { rct12_award * src = &_s4.awards[i]; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 03f3222f88..dddb46ed79 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -161,6 +161,8 @@ void S6Importer::LoadScenario(SDL_RWops *rw) void S6Importer::Import() { + Initialise(); + // _s6.header gS6Info = _s6.info; @@ -267,7 +269,6 @@ void S6Importer::Import() memcpy(gPeepWarningThrottle, _s6.peep_warning_throttle, sizeof(_s6.peep_warning_throttle)); // Awards - award_reset(); for (sint32 i = 0; i < RCT12_MAX_AWARDS; i++) { rct12_award * src = &_s6.awards[i]; @@ -389,6 +390,11 @@ void S6Importer::Import() } } +void S6Importer::Initialise() +{ + game_init_all(_s6.map_size); +} + extern "C" { /** diff --git a/src/openrct2/rct2/S6Importer.h b/src/openrct2/rct2/S6Importer.h index 65760b1a6c..29e1f0f423 100644 --- a/src/openrct2/rct2/S6Importer.h +++ b/src/openrct2/rct2/S6Importer.h @@ -43,4 +43,6 @@ private: const utf8 * _s6Path = nullptr; rct_s6_data _s6; uint8 _gameVersion = 0; + + void Initialise(); };