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

10
src/bridge_signal_map.h
View File

@@ -36,7 +36,7 @@ enum {
BRIDGE_M2_SIGNAL_STATE_EXT_FLAG = 0x8000,
};
static inline SignalState GetBridgeEntranceSimulatedSignalState(TileIndex t, uint16 signal)
inline SignalState GetBridgeEntranceSimulatedSignalState(TileIndex t, uint16 signal)
{
if (signal < BRIDGE_M2_SIGNAL_STATE_COUNT) {
return GB(_m[t].m2, signal + BRIDGE_M2_SIGNAL_STATE_OFFSET, 1) ? SIGNAL_STATE_RED : SIGNAL_STATE_GREEN;
@@ -47,7 +47,7 @@ static inline SignalState GetBridgeEntranceSimulatedSignalState(TileIndex t, uin
void SetBridgeEntranceSimulatedSignalStateExtended(TileIndex t, uint16 signal, SignalState state);
static inline void SetBridgeEntranceSimulatedSignalState(TileIndex t, uint16 signal, SignalState state)
inline void SetBridgeEntranceSimulatedSignalState(TileIndex t, uint16 signal, SignalState state)
{
if (signal < BRIDGE_M2_SIGNAL_STATE_COUNT) {
SB(_m[t].m2, signal + BRIDGE_M2_SIGNAL_STATE_OFFSET, 1, (state == SIGNAL_STATE_RED) ? 1 : 0);
@@ -58,7 +58,7 @@ static inline void SetBridgeEntranceSimulatedSignalState(TileIndex t, uint16 sig
bool SetAllBridgeEntranceSimulatedSignalsGreenExtended(TileIndex t);
static inline bool SetAllBridgeEntranceSimulatedSignalsGreen(TileIndex t)
inline bool SetAllBridgeEntranceSimulatedSignalsGreen(TileIndex t)
{
if (_m[t].m2 & BRIDGE_M2_SIGNAL_STATE_EXT_FLAG) {
return SetAllBridgeEntranceSimulatedSignalsGreenExtended(t);
@@ -71,7 +71,7 @@ static inline bool SetAllBridgeEntranceSimulatedSignalsGreen(TileIndex t)
void ClearBridgeEntranceSimulatedSignalsExtended(TileIndex t);
static inline void ClearBridgeEntranceSimulatedSignals(TileIndex t)
inline void ClearBridgeEntranceSimulatedSignals(TileIndex t)
{
if (_m[t].m2 & BRIDGE_M2_SIGNAL_STATE_EXT_FLAG) {
ClearBridgeEntranceSimulatedSignalsExtended(t);
@@ -84,7 +84,7 @@ void ClearBridgeSimulatedSignalMapping();
void SetBridgeSignalStyle(TileIndex t, uint8 style);
static inline uint8 GetBridgeSignalStyle(TileIndex t)
inline uint8 GetBridgeSignalStyle(TileIndex t)
{
if (likely(!HasBit(_m[t].m3, 7))) return 0;