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

Use inline for direction functions in Location.hpp

This commit is contained in:
ζeh Matt 2021-08-24 15:07:25 -07:00 committed by GitHub
parent 55add9883f
commit eccbbdbe59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/world/Location.hpp
View File

@ -496,12 +496,12 @@ constexpr Direction ALL_DIRECTIONS[] = { 0, 1, 2, 3 };
* Given a direction, return the direction that points the other way, * Given a direction, return the direction that points the other way,
* on the same axis. * on the same axis.
*/ */
[[maybe_unused]] static constexpr Direction direction_reverse(Direction dir) inline constexpr Direction direction_reverse(Direction dir)
{ {
return dir ^ 2; return dir ^ 2;
} }
[[maybe_unused]] static constexpr bool direction_valid(Direction dir) inline constexpr bool direction_valid(Direction dir)
{ {
return dir < NumOrthogonalDirections; return dir < NumOrthogonalDirections;
} }
@ -510,7 +510,7 @@ constexpr Direction ALL_DIRECTIONS[] = { 0, 1, 2, 3 };
* Given a direction, return the next cardinal direction, wrapping around if necessary. * Given a direction, return the next cardinal direction, wrapping around if necessary.
* (TODO: Figure out if this is CW or CCW) * (TODO: Figure out if this is CW or CCW)
*/ */
[[maybe_unused]] static constexpr Direction direction_next(Direction dir) inline constexpr Direction direction_next(Direction dir)
{ {
return (dir + 1) & 0x03; return (dir + 1) & 0x03;
} }
@ -519,7 +519,7 @@ constexpr Direction ALL_DIRECTIONS[] = { 0, 1, 2, 3 };
* Given a direction, return the previous cardinal direction, wrapping around if necessary. * Given a direction, return the previous cardinal direction, wrapping around if necessary.
* (TODO: Figure out if this is CW or CCW) * (TODO: Figure out if this is CW or CCW)
*/ */
[[maybe_unused]] static constexpr Direction direction_prev(Direction dir) inline constexpr Direction direction_prev(Direction dir)
{ {
return (dir - 1) & 0x03; return (dir - 1) & 0x03;
} }
@ -527,7 +527,7 @@ constexpr Direction ALL_DIRECTIONS[] = { 0, 1, 2, 3 };
/** /**
* Given two positions, return the cardinal direction which is closest to the direction from 'from' to 'to'. * Given two positions, return the cardinal direction which is closest to the direction from 'from' to 'to'.
*/ */
[[maybe_unused]] static constexpr Direction DirectionFromTo(const CoordsXY& from, const CoordsXY& to) inline constexpr Direction DirectionFromTo(const CoordsXY& from, const CoordsXY& to)
{ {
int16_t x_diff = to.x - from.x; int16_t x_diff = to.x - from.x;
int16_t y_diff = to.y - from.y; int16_t y_diff = to.y - from.y;