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:35:58 -03:00
parent 7193ba1bb7
commit 121585578e
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,15 +253,21 @@ private:
if (td->type == RIDE_TYPE_MAZE)
{
rct_td46_maze_element mazeElement{};
mazeElement.all = !0;
while (mazeElement.all != 0)
rct_td46_maze_element t4MazeElement{};
t4MazeElement.all = !0;
while (t4MazeElement.all != 0)
{
_stream.Read(&mazeElement, sizeof(rct_td46_maze_element));
if (mazeElement.all != 0)
_stream.Read(&t4MazeElement, sizeof(rct_td46_maze_element));
if (t4MazeElement.all != 0)
{
TrackDesignMazeElement mazeElement{};
mazeElement.x = t4MazeElement.x;
mazeElement.y = t4MazeElement.y;
mazeElement.direction = t4MazeElement.direction;
mazeElement.type = t4MazeElement.type;
td->maze_elements.push_back(mazeElement);
}
}
}
else

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

@ -138,13 +138,18 @@ public:
if (td->type == RIDE_TYPE_MAZE)
{
rct_td46_maze_element mazeElement{};
mazeElement.all = !0;
while (mazeElement.all != 0)
rct_td46_maze_element t4MazeElement{};
t4MazeElement.all = !0;
while (t4MazeElement.all != 0)
{
_stream.Read(&mazeElement, sizeof(rct_td46_maze_element));
if (mazeElement.all != 0)
_stream.Read(&t4MazeElement, sizeof(rct_td46_maze_element));
if (t4MazeElement.all != 0)
{
TrackDesignMazeElement mazeElement{};
mazeElement.x = t4MazeElement.x;
mazeElement.y = t4MazeElement.y;
mazeElement.direction = t4MazeElement.direction;
mazeElement.type = t4MazeElement.type;
td->maze_elements.push_back(mazeElement);
}
}

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

@ -74,12 +74,6 @@ struct TrackDesignMazeElement
};
};
};
TrackDesignMazeElement() = default;
TrackDesignMazeElement(const rct_td46_maze_element& formerMazeElement)
: all(formerMazeElement.all)
{
}
};
struct TrackDesign