dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/3rdparty/squirrel/include/squirrel.h
#	src/blitter/32bpp_sse_func.hpp
#	src/bridge_map.h
#	src/clear_map.h
#	src/company_manager_face.h
#	src/console_func.h
#	src/core/bitmath_func.hpp
#	src/core/endian_func.hpp
#	src/core/random_func.hpp
#	src/depot_map.h
#	src/elrail_func.h
#	src/fontcache.h
#	src/industry_map.h
#	src/map_func.h
#	src/newgrf_spritegroup.h
#	src/object_map.h
#	src/rail.h
#	src/rail_map.h
#	src/road_func.h
#	src/road_map.h
#	src/saveload/saveload.h
#	src/saveload/saveload_error.hpp
#	src/settings_gui.cpp
#	src/sl/oldloader.h
#	src/sprite.h
#	src/spritecache.h
#	src/station_func.h
#	src/station_map.h
#	src/story_base.h
#	src/strings_func.h
#	src/tile_cmd.h
#	src/tile_map.h
#	src/tile_type.h
#	src/town.h
#	src/town_map.h
#	src/tree_map.h
#	src/tunnel_map.h
#	src/tunnelbridge_map.h
#	src/vehicle_func.h
#	src/viewport_func.h
#	src/void_map.h
#	src/water.h
#	src/water_map.h
#	src/widget_type.h
This commit is contained in:
Jonathan G Rennison
2024-01-07 15:00:16 +00:00
parent 8271813a47 1e56bd1e5a
commit 55d78a23be
106 changed files with 1080 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/direction_func.h
View File

@@ -18,7 +18,7 @@
* @param d The value to check
* @return True if the value belongs to a DiagDirection, else false
*/
static inline bool IsValidDiagDirection(DiagDirection d)
inline bool IsValidDiagDirection(DiagDirection d)
{
return d < DIAGDIR_END;
}
@@ -29,7 +29,7 @@ static inline bool IsValidDiagDirection(DiagDirection d)
* @param d The value to check
* @return True if the value belongs to a Direction, else false
*/
static inline bool IsValidDirection(Direction d)
inline bool IsValidDirection(Direction d)
{
return d < DIR_END;
}
@@ -40,7 +40,7 @@ static inline bool IsValidDirection(Direction d)
* @param d The value to check
* @return True if the value belongs to an Axis, else false
*/
static inline bool IsValidAxis(Axis d)
inline bool IsValidAxis(Axis d)
{
return d < AXIS_END;
}
@@ -51,7 +51,7 @@ static inline bool IsValidAxis(Axis d)
* @param d The direction to get the reverse from
* @return The reverse Direction
*/
static inline Direction ReverseDir(Direction d)
inline Direction ReverseDir(Direction d)
{
dbg_assert(IsValidDirection(d));
return (Direction)(4 ^ d);
@@ -65,7 +65,7 @@ static inline Direction ReverseDir(Direction d)
* @param d1 The second direction as the offset from the base
* @return The difference how the second direction drifts of the first one.
*/
static inline DirDiff DirDifference(Direction d0, Direction d1)
inline DirDiff DirDifference(Direction d0, Direction d1)
{
dbg_assert(IsValidDirection(d0));
dbg_assert(IsValidDirection(d1));
@@ -85,7 +85,7 @@ static inline DirDiff DirDifference(Direction d0, Direction d1)
* @param delta The second difference to add on
* @return The resulting difference
*/
static inline DirDiff ChangeDirDiff(DirDiff d, DirDiff delta)
inline DirDiff ChangeDirDiff(DirDiff d, DirDiff delta)
{
/* Cast to uint so compiler can use bitmask. Result can never be negative. */
return (DirDiff)((uint)(d + delta) % 8);
@@ -101,7 +101,7 @@ static inline DirDiff ChangeDirDiff(DirDiff d, DirDiff delta)
* @param delta The offset/drift applied to the direction
* @return The new direction
*/
static inline Direction ChangeDir(Direction d, DirDiff delta)
inline Direction ChangeDir(Direction d, DirDiff delta)
{
dbg_assert(IsValidDirection(d));
/* Cast to uint so compiler can use bitmask. Result can never be negative. */
@@ -115,7 +115,7 @@ static inline Direction ChangeDir(Direction d, DirDiff delta)
* @param d The DiagDirection to get the reverse from
* @return The reverse direction
*/
static inline DiagDirection ReverseDiagDir(DiagDirection d)
inline DiagDirection ReverseDiagDir(DiagDirection d)
{
dbg_assert(IsValidDiagDirection(d));
return (DiagDirection)(2 ^ d);
@@ -128,7 +128,7 @@ static inline DiagDirection ReverseDiagDir(DiagDirection d)
* @param d1 The second direction as the offset from the base
* @return The difference how the second direction drifts of the first one.
*/
static inline DiagDirDiff DiagDirDifference(DiagDirection d0, DiagDirection d1)
inline DiagDirDiff DiagDirDifference(DiagDirection d0, DiagDirection d1)
{
dbg_assert(IsValidDiagDirection(d0));
dbg_assert(IsValidDiagDirection(d1));
@@ -146,7 +146,7 @@ static inline DiagDirDiff DiagDirDifference(DiagDirection d0, DiagDirection d1)
* @param delta The difference to apply on
* @return The new direction which was calculated
*/
static inline DiagDirection ChangeDiagDir(DiagDirection d, DiagDirDiff delta)
inline DiagDirection ChangeDiagDir(DiagDirection d, DiagDirDiff delta)
{
dbg_assert(IsValidDiagDirection(d));
/* Cast to uint so compiler can use bitmask. Result can never be negative. */
@@ -163,7 +163,7 @@ static inline DiagDirection ChangeDiagDir(DiagDirection d, DiagDirDiff delta)
* @param dir The direction to convert
* @return The resulting DiagDirection, maybe "rounded clockwise".
*/
static inline DiagDirection DirToDiagDir(Direction dir)
inline DiagDirection DirToDiagDir(Direction dir)
{
dbg_assert(IsValidDirection(dir));
return (DiagDirection)(dir >> 1);
@@ -179,7 +179,7 @@ static inline DiagDirection DirToDiagDir(Direction dir)
* @param dir The direction to convert
* @return The resulting Direction
*/
static inline Direction DiagDirToDir(DiagDirection dir)
inline Direction DiagDirToDir(DiagDirection dir)
{
dbg_assert(IsValidDiagDirection(dir));
return (Direction)(dir * 2 + 1);
@@ -194,7 +194,7 @@ static inline Direction DiagDirToDir(DiagDirection dir)
* @param a The given axis
* @return The other axis
*/
static inline Axis OtherAxis(Axis a)
inline Axis OtherAxis(Axis a)
{
dbg_assert(IsValidAxis(a));
return (Axis)(a ^ 1);
@@ -211,7 +211,7 @@ static inline Axis OtherAxis(Axis a)
* @param d The DiagDirection
* @return The axis which belongs to the direction
*/
static inline Axis DiagDirToAxis(DiagDirection d)
inline Axis DiagDirToAxis(DiagDirection d)
{
dbg_assert(IsValidDiagDirection(d));
return (Axis)(d & 1);
@@ -229,7 +229,7 @@ static inline Axis DiagDirToAxis(DiagDirection d)
* @param a The axis
* @return The direction pointed to south
*/
static inline DiagDirection AxisToDiagDir(Axis a)
inline DiagDirection AxisToDiagDir(Axis a)
{
dbg_assert(IsValidAxis(a));
return (DiagDirection)(2 - a);
@@ -246,7 +246,7 @@ static inline DiagDirection AxisToDiagDir(Axis a)
* @param a The axis
* @return The direction pointed to south
*/
static inline Direction AxisToDirection(Axis a)
inline Direction AxisToDirection(Axis a)
{
dbg_assert(IsValidAxis(a));
return (Direction)(5 - 2 * a);
@@ -258,7 +258,7 @@ static inline Direction AxisToDirection(Axis a)
* @param ns north -> 0, south -> 1
* @return the desired DiagDirection
*/
static inline DiagDirection XYNSToDiagDir(Axis xy, uint ns)
inline DiagDirection XYNSToDiagDir(Axis xy, uint ns)
{
dbg_assert(IsValidAxis(xy));
return (DiagDirection)(xy * 3 ^ ns * 2);
@@ -270,7 +270,7 @@ static inline DiagDirection XYNSToDiagDir(Axis xy, uint ns)
* @param dir The given direction.
* @return True if the direction is diagonal.
*/
static inline bool IsDiagonalDirection(Direction dir)
inline bool IsDiagonalDirection(Direction dir)
{
dbg_assert(IsValidDirection(dir));
return (dir & 1) != 0;
@@ -287,7 +287,7 @@ static inline bool IsDiagonalDirection(Direction dir)
* @param axis axis to convert
* @return The resulting DiagDirection, may be INVALID_DIAGDIR
*/
static inline DiagDirection DirToDiagDirAlongAxis(Direction dir, Axis axis)
inline DiagDirection DirToDiagDirAlongAxis(Direction dir, Axis axis)
{
dbg_assert(IsValidDirection(dir));
dbg_assert(IsValidAxis(axis));