mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove implicit conversion constructor

This commit is contained in:
Tulio Leao 2019-10-08 07:40:23 -03:00
parent ff57f43996
commit 68ce43308e
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/rct1/T4Importer.cpp
View File

@ -266,11 +266,14 @@ private:
}
else
{
rct_td46_track_element trackElement{};
rct_td46_track_element t4TrackElement{};
for (uint8_t endFlag = _stream.ReadValue<uint8_t>(); endFlag != 0xFF; endFlag = _stream.ReadValue<uint8_t>())
{
_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);
}
}

7
src/openrct2/rct2/T6Importer.cpp
View File

@ -151,11 +151,14 @@ public:
}
else
{
rct_td46_track_element trackElement{};
rct_td46_track_element t4TrackElement{};
for (uint8_t endFlag = _stream.ReadValue<uint8_t>(); endFlag != 0xFF; endFlag = _stream.ReadValue<uint8_t>())
{
_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);
}

6
src/openrct2/ride/TrackDesign.h
View File

@ -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