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

Fix 'unused private field' warnings

This commit is contained in:
Gymnasiast 2019-08-18 19:53:01 +02:00
parent bf1f14b441
commit aae2b24a7f
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,7 +139,10 @@ private:
uint8_t terrain; // 5 0xE0 Terrain Style, 0x1F Water height
uint8_t grass_length; // 6
uint8_t ownership; // 7
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-private-field"
uint8_t pad_08[8];
#pragma clang diagnostic pop
public:
uint8_t GetSlope() const;
@ -181,7 +184,10 @@ private:
uint8_t additionStatus; // 7
ride_id_t rideIndex;
};
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-private-field"
uint8_t pad_08[8];
#pragma clang diagnostic pop
public:
uint8_t GetPathEntryIndex() const;
@ -271,7 +277,10 @@ struct TrackElement : TileElementBase
uint16_t mazeEntry; // 5
};
ride_id_t rideIndex; // 7
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-private-field"
uint8_t pad_08[8];
#pragma clang diagnostic pop
public:
uint8_t GetTrackType() const;
@ -341,7 +350,10 @@ private:
uint8_t age; // 5
uint8_t colour_1; // 6
uint8_t colour_2; // 7
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-private-field"
uint8_t pad_08[8];
#pragma clang diagnostic pop
public:
uint8_t GetEntryIndex() const;
@ -366,7 +378,10 @@ struct LargeSceneryElement : TileElementBase
private:
uint16_t entryIndex; // 4
uint8_t colour[2]; // 6
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-private-field"
uint8_t pad_08[8];
#pragma clang diagnostic pop
public:
uint32_t GetEntryIndex() const;
@ -401,7 +416,10 @@ private:
};
uint8_t colour_1; // 6 0b_2221_1111 2 = colour_2 (uses flags for rest of colour2), 1 = colour_1
uint8_t animation; // 7 0b_dfff_ft00 d = direction, f = frame num, t = across track flag (not used)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-private-field"
uint8_t pad_08[8];
#pragma clang diagnostic pop
public:
uint8_t GetEntryIndex() const;
@ -443,7 +461,10 @@ private:
uint8_t index; // 5. 0bUSSS????, S = station index.
uint8_t pathType; // 6
ride_id_t rideIndex; // 7
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-private-field"
uint8_t pad_08[8];
#pragma clang diagnostic pop
public:
uint8_t GetEntranceType() const;