mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity

Extend support for 8 cars corrupt elements

Browse Source
This commit is contained in:
Michael Steenbeek
2018-11-05 11:40:43 +01:00
parent 00ba0c1f51
commit b01ff01e82
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/openrct2/rct12/RCT12.h
View File

@@ -89,7 +89,8 @@ enum class RCT12TileElementType : uint8_t
LargeScenery = (6 << 2),
Banner = (7 << 2),
Corrupt = (8 << 2),
EightCarsCorrupt = (15 << 2),
EightCarsCorrupt14 = (14 << 2),
EightCarsCorrupt15 = (15 << 2),
};
struct RCT12SurfaceElement;
struct RCT12PathElement;
@@ -100,7 +101,8 @@ struct RCT12WallElement;
struct RCT12EntranceElement;
struct RCT12BannerElement;
struct RCT12CorruptElement;
struct RCT12EightCarsCorruptElement;
struct RCT12EightCarsCorruptElement14;
struct RCT12EightCarsCorruptElement15;
struct RCT12TileElementBase
{
@@ -157,14 +159,6 @@ struct RCT12TileElement : public RCT12TileElementBase
{
return as<RCT12BannerElement, RCT12TileElementType::Banner>();
}
RCT12CorruptElement* AsCorrupt() const
{
return as<RCT12CorruptElement, RCT12TileElementType::Corrupt>();
}
RCT12EightCarsCorruptElement* AsEightCarsCorrupt() const
{
return as<RCT12EightCarsCorruptElement, RCT12TileElementType::EightCarsCorrupt>();
}
void ClearAs(uint8_t newType);
};
assert_struct_size(RCT12TileElement, 8);
@@ -358,10 +352,16 @@ struct RCT12CorruptElement : RCT12TileElementBase
};
assert_struct_size(RCT12CorruptElement, 8);
struct RCT12EightCarsCorruptElement : RCT12TileElementBase
struct RCT12EightCarsCorruptElement14 : RCT12TileElementBase
{
uint8_t pad[4];
};
assert_struct_size(RCT12EightCarsCorruptElement, 8);
assert_struct_size(RCT12EightCarsCorruptElement14, 8);
struct RCT12EightCarsCorruptElement15 : RCT12TileElementBase
{
uint8_t pad[4];
};
assert_struct_size(RCT12EightCarsCorruptElement15, 8);
#pragma pack(pop)

3
src/openrct2/rct2/S6Importer.cpp
View File

@@ -857,7 +857,8 @@ public:
auto tileElementType = (RCT12TileElementType)src->GetType();
// Todo: replace with setting invisibility bit
if (tileElementType == RCT12TileElementType::Corrupt
|| tileElementType == RCT12TileElementType::EightCarsCorrupt)
|| tileElementType == RCT12TileElementType::EightCarsCorrupt14
|| tileElementType == RCT12TileElementType::EightCarsCorrupt15)
memcpy(dst, src, sizeof(*src));
else
ImportTileElement(dst, src);