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

Modify Large Scenery tile element to use 16 bytes

This commit is contained in:
Gymnasiast 2019-08-30 22:07:07 +02:00
parent 7e8ab6b693
commit f4eceaf35e
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
2 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/openrct2/world/LargeScenery.cpp
View File

@ -17,26 +17,24 @@
colour_t LargeSceneryElement::GetPrimaryColour() const
{
return colour[0] & TILE_ELEMENT_COLOUR_MASK;
return Colour[0];
}
colour_t LargeSceneryElement::GetSecondaryColour() const
{
return colour[1] & TILE_ELEMENT_COLOUR_MASK;
return Colour[1];
}
void LargeSceneryElement::SetPrimaryColour(colour_t newColour)
{
assert(newColour <= 31);
colour[0] &= ~TILE_ELEMENT_COLOUR_MASK;
colour[0] |= newColour;
Colour[0] = newColour;
}
void LargeSceneryElement::SetSecondaryColour(colour_t newColour)
{
assert(newColour <= 31);
colour[1] &= ~TILE_ELEMENT_COLOUR_MASK;
colour[1] |= newColour;
Colour[1] = newColour;
}
Banner* LargeSceneryElement::GetBanner() const
@ -46,14 +44,12 @@ Banner* LargeSceneryElement::GetBanner() const
BannerIndex LargeSceneryElement::GetBannerIndex() const
{
return (type & 0xC0) | (((colour[0]) & ~TILE_ELEMENT_COLOUR_MASK) >> 2) | (((colour[1]) & ~TILE_ELEMENT_COLOUR_MASK) >> 5);
return BannerIndex;
}
void LargeSceneryElement::SetBannerIndex(BannerIndex newIndex)
void LargeSceneryElement::SetBannerIndex(::BannerIndex newIndex)
{
type |= newIndex & 0xC0;
colour[0] |= (newIndex & 0x38) << 2;
colour[1] |= (newIndex & 7) << 5;
this->BannerIndex = newIndex;
}
bool LargeSceneryElement::IsAccounted() const
@ -75,7 +71,7 @@ void LargeSceneryElement::SetIsAccounted(bool isAccounted)
uint32_t LargeSceneryElement::GetEntryIndex() const
{
return entryIndex & TILE_ELEMENT_LARGE_TYPE_MASK;
return EntryIndex;
}
rct_scenery_entry* LargeSceneryElement::GetEntry() const
@ -83,21 +79,19 @@ rct_scenery_entry* LargeSceneryElement::GetEntry() const
return get_large_scenery_entry(GetEntryIndex());
}
uint16_t LargeSceneryElement::GetSequenceIndex() const
uint8_t LargeSceneryElement::GetSequenceIndex() const
{
return (entryIndex >> 10);
return SequenceIndex;
}
void LargeSceneryElement::SetEntryIndex(uint32_t newIndex)
{
entryIndex &= ~TILE_ELEMENT_LARGE_TYPE_MASK;
entryIndex |= (newIndex & TILE_ELEMENT_LARGE_TYPE_MASK);
EntryIndex = newIndex;
}
void LargeSceneryElement::SetSequenceIndex(uint16_t sequence)
void LargeSceneryElement::SetSequenceIndex(uint8_t sequence)
{
entryIndex &= TILE_ELEMENT_LARGE_TYPE_MASK;
entryIndex |= (sequence << 10);
SequenceIndex = sequence;
}
rct_scenery_entry* get_large_scenery_entry(int32_t entryIndex)

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

@ -373,20 +373,18 @@ assert_struct_size(SmallSceneryElement, 16);
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
uint32_t EntryIndex;
uint32_t BannerIndex;
uint8_t SequenceIndex;
uint8_t Colour[3];
public:
uint32_t GetEntryIndex() const;
void SetEntryIndex(uint32_t newIndex);
rct_scenery_entry* GetEntry() const;
uint16_t GetSequenceIndex() const;
void SetSequenceIndex(uint16_t newIndex);
uint8_t GetSequenceIndex() const;
void SetSequenceIndex(uint8_t newIndex);
colour_t GetPrimaryColour() const;
void SetPrimaryColour(colour_t colour);
@ -394,8 +392,8 @@ public:
void SetSecondaryColour(colour_t colour);
Banner* GetBanner() const;
BannerIndex GetBannerIndex() const;
void SetBannerIndex(BannerIndex newIndex);
::BannerIndex GetBannerIndex() const;
void SetBannerIndex(::BannerIndex newIndex);
bool IsAccounted() const;
void SetIsAccounted(bool isAccounted);