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

Move getting track sequence to struct methods

Browse Source
This commit is contained in:
Gymnasiast
2018-09-17 22:10:15 +02:00
parent 3b80d049ef
commit ae4c464ce7
13 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/testpaint/Compat.cpp
View File

@@ -185,17 +185,6 @@ void tile_element_set_station(rct_tile_element* tileElement, uint32_t stationInd
tileElement->properties.track.sequence |= (stationIndex << 4);
}
int32_t tile_element_get_track_sequence(const rct_tile_element* tileElement)
{
return tileElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_SEQUENCE_MASK;
}
void tile_element_set_track_sequence(rct_tile_element* tileElement, int trackSequence)
{
tileElement->properties.track.sequence &= ~MAP_ELEM_TRACK_SEQUENCE_SEQUENCE_MASK;
tileElement->properties.track.sequence |= (trackSequence & MAP_ELEM_TRACK_SEQUENCE_SEQUENCE_MASK);
}
bool tile_element_get_green_light(const rct_tile_element* tileElement)
{
return (tileElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_GREEN_LIGHT) != 0;
@@ -217,7 +206,8 @@ int tile_element_get_brake_booster_speed(const rct_tile_element* tileElement)
void tile_element_set_brake_booster_speed(rct_tile_element* tileElement, int speed)
{
tileElement->properties.track.sequence = tile_element_get_track_sequence(tileElement) | ((speed >> 1) << 4);
tileElement->properties.track.sequence &= ~0b11110000;
tileElement->properties.track.sequence |= ((speed >> 1) << 4);
}
bool tile_element_is_taking_photo(const rct_tile_element* tileElement)
@@ -302,6 +292,17 @@ void TrackElement::SetTrackType(uint8_t newType)
trackType = newType;
}
uint8_t TrackElement::GetSequenceIndex() const
{
return sequence & MAP_ELEM_TRACK_SEQUENCE_SEQUENCE_MASK;
}
void TrackElement::SetSequenceIndex(uint8_t newSequenceIndex)
{
sequence &= ~MAP_ELEM_TRACK_SEQUENCE_SEQUENCE_MASK;
sequence |= (newSequenceIndex & MAP_ELEM_TRACK_SEQUENCE_SEQUENCE_MASK);
}
uint8_t track_element_get_ride_index(const rct_tile_element* tileElement)
{
return tileElement->properties.track.ride_index;