mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Refactor MazeGetSegmentBit to use const CoordsXY&

Browse Source
This commit is contained in:
Gal B
2021-12-22 00:18:42 +02:00
parent 343f9bbca0
commit 367fcaad3c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/actions/MazeSetTrackAction.cpp
View File

@@ -207,7 +207,7 @@ GameActions::Result MazeSetTrackAction::Execute() const
{
case GC_SET_MAZE_TRACK_BUILD:
{
uint8_t segmentOffset = MazeGetSegmentBit(_loc.x, _loc.y);
uint8_t segmentOffset = MazeGetSegmentBit(_loc);
tileElement->AsTrack()->MazeEntrySubtract(1 << segmentOffset);
@@ -259,7 +259,7 @@ GameActions::Result MazeSetTrackAction::Execute() const
return res;
}
uint32_t segmentBit = MazeGetSegmentBit(previousSegment.x, previousSegment.y);
uint32_t segmentBit = MazeGetSegmentBit(previousSegment);
tileElement->AsTrack()->MazeEntryAdd(1 << segmentBit);
segmentBit--;
@@ -302,10 +302,10 @@ GameActions::Result MazeSetTrackAction::Execute() const
return res;
}
uint8_t MazeSetTrackAction::MazeGetSegmentBit(uint16_t x, uint16_t y) const
uint8_t MazeSetTrackAction::MazeGetSegmentBit(const CoordsXY& coords) const
{
uint8_t minorX = x & 0x1F; // 0 or 16
uint8_t minorY = y & 0x1F; // 0 or 16
uint8_t minorX = coords.x & 0x1F;
uint8_t minorY = coords.y & 0x1F;
if (minorX == 0 && minorY == 0)
{

2
src/openrct2/actions/MazeSetTrackAction.h
View File

@@ -55,5 +55,5 @@ public:
GameActions::Result Execute() const override;
private:
uint8_t MazeGetSegmentBit(uint16_t x, uint16_t y) const;
uint8_t MazeGetSegmentBit(const CoordsXY&) const;
};