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

Fix #10069. Actually pass the track element flags to the new element. 

Mistake made whilst refactoring #10058. Flags were incorrectly been taken from the destination and not the source.

Refactored names to use the correct t number
This commit is contained in:
duncanspumpkin 2019-10-10 18:48:05 +01:00
parent 57a208d560
commit bb042213fd
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,7 +278,7 @@ private:
_stream.Read(&t4TrackElement, sizeof(rct_td46_track_element));
TrackDesignTrackElement trackElement{};
trackElement.type = t4TrackElement.type;
trackElement.flags = trackElement.flags;
trackElement.flags = t4TrackElement.flags;
td->track_elements.push_back(trackElement);
}
}

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

@ -138,32 +138,32 @@ public:
if (td->type == RIDE_TYPE_MAZE)
{
rct_td46_maze_element t4MazeElement{};
t4MazeElement.all = !0;
while (t4MazeElement.all != 0)
rct_td46_maze_element t6MazeElement{};
t6MazeElement.all = !0;
while (t6MazeElement.all != 0)
{
_stream.Read(&t4MazeElement, sizeof(rct_td46_maze_element));
if (t4MazeElement.all != 0)
_stream.Read(&t6MazeElement, sizeof(rct_td46_maze_element));
if (t6MazeElement.all != 0)
{
TrackDesignMazeElement mazeElement{};
mazeElement.x = t4MazeElement.x;
mazeElement.y = t4MazeElement.y;
mazeElement.direction = t4MazeElement.direction;
mazeElement.type = t4MazeElement.type;
mazeElement.x = t6MazeElement.x;
mazeElement.y = t6MazeElement.y;
mazeElement.direction = t6MazeElement.direction;
mazeElement.type = t6MazeElement.type;
td->maze_elements.push_back(mazeElement);
}
}
}
else
{
rct_td46_track_element t4TrackElement{};
rct_td46_track_element t6TrackElement{};
for (uint8_t endFlag = _stream.ReadValue<uint8_t>(); endFlag != 0xFF; endFlag = _stream.ReadValue<uint8_t>())
{
_stream.SetPosition(_stream.GetPosition() - 1);
_stream.Read(&t4TrackElement, sizeof(rct_td46_track_element));
_stream.Read(&t6TrackElement, sizeof(rct_td46_track_element));
TrackDesignTrackElement trackElement{};
trackElement.type = t4TrackElement.type;
trackElement.flags = trackElement.flags;
trackElement.type = t6TrackElement.type;
trackElement.flags = t6TrackElement.flags;
td->track_elements.push_back(trackElement);
}