diff --git a/src/openrct2/rct1/T4Importer.cpp b/src/openrct2/rct1/T4Importer.cpp index 7d7799662c..9e19b0dd71 100644 --- a/src/openrct2/rct1/T4Importer.cpp +++ b/src/openrct2/rct1/T4Importer.cpp @@ -266,11 +266,14 @@ private: } else { - rct_td46_track_element trackElement{}; + rct_td46_track_element t4TrackElement{}; for (uint8_t endFlag = _stream.ReadValue(); endFlag != 0xFF; endFlag = _stream.ReadValue()) { _stream.SetPosition(_stream.GetPosition() - 1); - _stream.Read(&trackElement, sizeof(rct_td46_track_element)); + _stream.Read(&t4TrackElement, sizeof(rct_td46_track_element)); + TrackDesignTrackElement trackElement{}; + trackElement.type = t4TrackElement.type; + trackElement.flags = trackElement.flags; td->track_elements.push_back(trackElement); } } diff --git a/src/openrct2/rct2/T6Importer.cpp b/src/openrct2/rct2/T6Importer.cpp index 3fe982fc29..770e25c2f2 100644 --- a/src/openrct2/rct2/T6Importer.cpp +++ b/src/openrct2/rct2/T6Importer.cpp @@ -151,11 +151,14 @@ public: } else { - rct_td46_track_element trackElement{}; + rct_td46_track_element t4TrackElement{}; for (uint8_t endFlag = _stream.ReadValue(); endFlag != 0xFF; endFlag = _stream.ReadValue()) { _stream.SetPosition(_stream.GetPosition() - 1); - _stream.Read(&trackElement, sizeof(rct_td46_track_element)); + _stream.Read(&t4TrackElement, sizeof(rct_td46_track_element)); + TrackDesignTrackElement trackElement{}; + trackElement.type = t4TrackElement.type; + trackElement.flags = trackElement.flags; td->track_elements.push_back(trackElement); } diff --git a/src/openrct2/ride/TrackDesign.h b/src/openrct2/ride/TrackDesign.h index f262309cfc..715c0f1eff 100644 --- a/src/openrct2/ride/TrackDesign.h +++ b/src/openrct2/ride/TrackDesign.h @@ -39,12 +39,6 @@ struct TrackDesignTrackElement { uint8_t type; // 0x00 uint8_t flags; // 0x01 - TrackDesignTrackElement() = default; - TrackDesignTrackElement(const rct_td46_track_element& formerTrackElement) - : type(formerTrackElement.type) - , flags(formerTrackElement.flags) - { - } }; struct TrackDesign