From feb140b84cdbb5ec2ea2eccdc8379470368685c0 Mon Sep 17 00:00:00 2001 From: janisozaur Date: Fri, 13 May 2016 11:36:24 +0200 Subject: [PATCH] Revert part of last commit unsuitable for older compilers (#3584) Also initialise all the items in gResearchedTrackTypesA and gResearchedTrackTypesB --- src/rct2/S6Importer.cpp | 1 + src/rct2/S6Importer.h | 2 +- src/windows/editor_bottom_toolbar.c | 5 +++++ src/windows/editor_object_selection.c | 6 ++++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/rct2/S6Importer.cpp b/src/rct2/S6Importer.cpp index e47f414621..63f83a7fdb 100644 --- a/src/rct2/S6Importer.cpp +++ b/src/rct2/S6Importer.cpp @@ -50,6 +50,7 @@ public: S6Importer::S6Importer() { FixIssues = false; + memset(&_s6, 0, sizeof(_s6)); } void S6Importer::LoadSavedGame(const utf8 * path) diff --git a/src/rct2/S6Importer.h b/src/rct2/S6Importer.h index a0dd78ff69..8b2fa9e37a 100644 --- a/src/rct2/S6Importer.h +++ b/src/rct2/S6Importer.h @@ -41,6 +41,6 @@ public: private: const utf8 * _s6Path = nullptr; - rct_s6_data _s6 = { 0 }; + rct_s6_data _s6; uint8 _gameVersion = 0; }; diff --git a/src/windows/editor_bottom_toolbar.c b/src/windows/editor_bottom_toolbar.c index 8ab1db651c..d6ffecd5ad 100644 --- a/src/windows/editor_bottom_toolbar.c +++ b/src/windows/editor_bottom_toolbar.c @@ -249,6 +249,11 @@ static void sub_66F6E3() gResearchedTrackTypesB[i] = (RideTypePossibleTrackConfigurations[i] >> 32ULL) & 0xFFFFFFFFULL; } + for (int i = countof(RideTypePossibleTrackConfigurations); i < 128; i++) { + gResearchedTrackTypesA[i] = (uint32)-1; + gResearchedTrackTypesB[i] = (uint32)-1; + } + for (int i = 0; i < 8; i++) { gResearchedRideEntries[i] = 0xFFFFFFFF; } diff --git a/src/windows/editor_object_selection.c b/src/windows/editor_object_selection.c index ecc84f91f4..6290ea083c 100644 --- a/src/windows/editor_object_selection.c +++ b/src/windows/editor_object_selection.c @@ -1943,6 +1943,12 @@ static void window_editor_object_selection_manage_tracks() gResearchedTrackTypesB[i] = (RideTypePossibleTrackConfigurations[i] >> 32ULL) & 0xFFFFFFFFULL; } + + for (int i = countof(RideTypePossibleTrackConfigurations); i < 128; i++) { + gResearchedTrackTypesA[i] = (uint32)-1; + gResearchedTrackTypesB[i] = (uint32)-1; + } + for (int i = 0; i < 8; i++) { gResearchedRideEntries[i] = 0xFFFFFFFF; }