mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Code Issues Releases Wiki Activity

Add fields to PathElement, port GetRCT1Path()

Browse Source
This commit is contained in:
Michael Steenbeek
2018-10-03 10:38:46 +02:00
parent 9138c9e4ac
commit deeb34f4aa
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,8 +60,6 @@
using namespace OpenRCT2;
static uint8_t GetPathType(rct_tile_element* tileElement);
class EntryList
{
private:
@@ -480,7 +478,7 @@ private:
{
case TILE_ELEMENT_TYPE_PATH:
{
uint8_t pathType = GetPathType(tileElement);
uint8_t pathType = tileElement->AsPath()->GetRCT1PathType();
uint8_t pathAdditionsType = tileElement->properties.path.additions & 0x0F;
AddEntryForPath(pathType);
@@ -2507,7 +2505,7 @@ private:
case TILE_ELEMENT_TYPE_PATH:
{
// Type
uint8_t pathType = GetPathType(tileElement);
uint8_t pathType = tileElement->AsPath()->GetRCT1PathType();
uint8_t entryIndex = _pathTypeToEntryMap[pathType];
tileElement->type &= ~TILE_ELEMENT_DIRECTION_MASK;
@@ -2886,13 +2884,13 @@ void load_from_sc4(const utf8* path)
s4Importer->Import();
}
static uint8_t GetPathType(rct_tile_element* tileElement)
uint8_t PathElement::GetRCT1PathType() const
{
uint8_t pathColour = tileElement->type & 3;
uint8_t pathType = (tileElement->properties.path.type & FOOTPATH_PROPERTIES_TYPE_MASK) >> 2;
uint8_t pathColour = type & 3;
uint8_t pathType2 = (pathType & FOOTPATH_PROPERTIES_TYPE_MASK) >> 2;
pathType = pathType | pathColour;
return pathType;
pathType2 = pathType2 | pathColour;
return pathType2;
}
int32_t WallElement::GetRCT1WallType(int32_t edge) const

12
src/openrct2/world/TileElement.h
View File

@@ -183,7 +183,17 @@ assert_struct_size(SurfaceElement, 8);
struct PathElement : TileElementBase
{
rct_tile_element_path_properties temp;
uint8_t pathType; // 4 0xF0 Path type, 0x08 Ride sign, 0x04 Set when path is diagonal, 0x03 Rotation
uint8_t additions; // 5
uint8_t edges; // 6
union
{
uint8_t additionStatus; // 7
uint8_t rideIndex;
};
public:
uint8_t GetRCT1PathType() const;
};
assert_struct_size(PathElement, 8);