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

32
src/object_map.h
View File

@@ -28,7 +28,7 @@ ObjectType GetObjectType(TileIndex t);
* @pre IsTileType(t, MP_OBJECT)
* @return True if type matches.
*/
static inline bool IsObjectType(TileIndex t, ObjectType type)
inline bool IsObjectType(TileIndex t, ObjectType type)
{
return GetObjectType(t) == type;
}
@@ -39,7 +39,7 @@ static inline bool IsObjectType(TileIndex t, ObjectType type)
* @param type Type to test.
* @return True if type matches.
*/
static inline bool IsObjectTypeTile(TileIndex t, ObjectType type)
inline bool IsObjectTypeTile(TileIndex t, ObjectType type)
{
return IsTileType(t, MP_OBJECT) && GetObjectType(t) == type;
}
@@ -50,7 +50,7 @@ static inline bool IsObjectTypeTile(TileIndex t, ObjectType type)
* @pre IsTileType(t, MP_OBJECT)
* @return The ObjectID of the object.
*/
static inline ObjectID GetObjectIndex(TileIndex t)
inline ObjectID GetObjectIndex(TileIndex t)
{
dbg_assert_tile(IsTileType(t, MP_OBJECT), t);
return _m[t].m2 | _m[t].m5 << 16;
@@ -62,7 +62,7 @@ static inline ObjectID GetObjectIndex(TileIndex t)
* @pre IsTileType(t, MP_OBJECT)
* @return The random bits.
*/
static inline byte GetObjectRandomBits(TileIndex t)
inline byte GetObjectRandomBits(TileIndex t)
{
dbg_assert_tile(IsTileType(t, MP_OBJECT), t);
return _m[t].m3;
@@ -74,7 +74,7 @@ static inline byte GetObjectRandomBits(TileIndex t)
* @pre IsTileType(t, MP_OBJECT)
* @return The ground type.
*/
static inline ObjectGround GetObjectGroundType(TileIndex t)
inline ObjectGround GetObjectGroundType(TileIndex t)
{
dbg_assert_tile(IsTileType(t, MP_OBJECT), t);
return (ObjectGround)GB(_m[t].m4, 2, 2);
@@ -87,7 +87,7 @@ static inline ObjectGround GetObjectGroundType(TileIndex t)
* @pre IsTileType(t, MP_OBJECT)
* @return the density
*/
static inline uint GetObjectGroundDensity(TileIndex t)
inline uint GetObjectGroundDensity(TileIndex t)
{
dbg_assert_tile(IsTileType(t, MP_OBJECT), t);
return GB(_m[t].m4, 0, 2);
@@ -100,7 +100,7 @@ static inline uint GetObjectGroundDensity(TileIndex t)
* @param d the new density
* @pre IsTileType(t, MP_OBJECT)
*/
static inline void SetObjectGroundDensity(TileIndex t, uint d)
inline void SetObjectGroundDensity(TileIndex t, uint d)
{
dbg_assert_tile(IsTileType(t, MP_OBJECT), t);
SB(_m[t].m4, 0, 2, d);
@@ -112,7 +112,7 @@ static inline void SetObjectGroundDensity(TileIndex t, uint d)
* @pre IsTileType(t, MP_OBJECT)
* @return The value of the counter
*/
static inline uint GetObjectGroundCounter(TileIndex t)
inline uint GetObjectGroundCounter(TileIndex t)
{
dbg_assert_tile(IsTileType(t, MP_OBJECT), t);
return GB(_m[t].m4, 5, 3);
@@ -124,7 +124,7 @@ static inline uint GetObjectGroundCounter(TileIndex t)
* @param c the amount to increment the counter with
* @pre IsTileType(t, MP_OBJECT)
*/
static inline void AddObjectGroundCounter(TileIndex t, int c)
inline void AddObjectGroundCounter(TileIndex t, int c)
{
dbg_assert_tile(IsTileType(t, MP_OBJECT), t);
_m[t].m4 += c << 5;
@@ -136,7 +136,7 @@ static inline void AddObjectGroundCounter(TileIndex t, int c)
* @param c The amount to set the counter to.
* @pre IsTileType(t, MP_OBJECT)
*/
static inline void SetObjectGroundCounter(TileIndex t, uint c)
inline void SetObjectGroundCounter(TileIndex t, uint c)
{
dbg_assert_tile(IsTileType(t, MP_OBJECT), t);
SB(_m[t].m4, 5, 3, c);
@@ -150,31 +150,31 @@ static inline void SetObjectGroundCounter(TileIndex t, uint c)
* @param density the density of the ground tile
* @pre IsTileType(t, MP_OBJECT)
*/
static inline void SetObjectGroundTypeDensity(TileIndex t, ObjectGround type, uint density)
inline void SetObjectGroundTypeDensity(TileIndex t, ObjectGround type, uint density)
{
dbg_assert_tile(IsTileType(t, MP_OBJECT), t);
_m[t].m4 = 0 << 5 | type << 2 | density;
}
static inline ObjectEffectiveFoundationType GetObjectEffectiveFoundationType(TileIndex t)
inline ObjectEffectiveFoundationType GetObjectEffectiveFoundationType(TileIndex t)
{
dbg_assert_tile(IsTileType(t, MP_OBJECT), t);
return (ObjectEffectiveFoundationType)GB(_me[t].m6, 0, 2);
}
static inline void SetObjectEffectiveFoundationType(TileIndex t, ObjectEffectiveFoundationType foundation_type)
inline void SetObjectEffectiveFoundationType(TileIndex t, ObjectEffectiveFoundationType foundation_type)
{
dbg_assert_tile(IsTileType(t, MP_OBJECT), t);
SB(_me[t].m6, 0, 2, foundation_type);
}
static inline bool GetObjectHasViewportMapViewOverride(TileIndex t)
inline bool GetObjectHasViewportMapViewOverride(TileIndex t)
{
dbg_assert_tile(IsTileType(t, MP_OBJECT), t);
return HasBit(_m[t].m4, 4);
}
static inline void SetObjectHasViewportMapViewOverride(TileIndex t, bool map_view_override)
inline void SetObjectHasViewportMapViewOverride(TileIndex t, bool map_view_override)
{
dbg_assert_tile(IsTileType(t, MP_OBJECT), t);
SB(_m[t].m4, 4, 1, map_view_override ? 1 : 0);
@@ -188,7 +188,7 @@ static inline void SetObjectHasViewportMapViewOverride(TileIndex t, bool map_vie
* @param wc Water class for this object.
* @param random Random data to store on the tile
*/
static inline void MakeObject(TileIndex t, Owner o, ObjectID index, WaterClass wc, byte random)
inline void MakeObject(TileIndex t, Owner o, ObjectID index, WaterClass wc, byte random)
{
SetTileType(t, MP_OBJECT);
SetTileOwner(t, o);