mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-29 01:35:06 +01:00
Code Issues Releases Wiki Activity

Fix import of RCT1 mazes

Browse Source
This commit is contained in:
Gymnasiast
2017-12-31 19:53:40 +01:00
parent deb95825e5
commit 559a5c662a
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/openrct2/rct1/S4Importer.cpp
View File

@@ -939,16 +939,6 @@ private:
void SetRideColourScheme(Ride * dst, rct1_ride * src)
{
// In RCT1 and AA, the maze was always hedges.
// LL has 4 types, like RCT2. For LL, only guard against invalid values.
if (dst->type == RIDE_TYPE_MAZE)
{
if (_gameVersion < FILE_VERSION_RCT1_LL || src->track_colour_supports[0] > 3)
dst->track_colour_supports[0] = MAZE_WALL_TYPE_HEDGE;
return;
}
// Colours
dst->colour_scheme_type = src->colour_scheme;
if (_gameVersion == FILE_VERSION_RCT1)
@@ -1031,6 +1021,16 @@ private:
}
}
}
// In RCT1 and AA, the maze was always hedges.
// LL has 4 types, like RCT2. For LL, only guard against invalid values.
if (dst->type == RIDE_TYPE_MAZE)
{
if (_gameVersion < FILE_VERSION_RCT1_LL || src->track_colour_supports[0] > 3)
dst->track_colour_supports[0] = MAZE_WALL_TYPE_HEDGE;
else
dst->track_colour_supports[0] = src->track_colour_supports[0];
}
}
void FixRideVehicleLinks(const uint16 * spriteIndexMap)