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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	.github/workflows/release-linux.yml
#	.github/workflows/release.yml
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/script/api/script_rail.cpp
#	src/settings_gui.cpp
#	src/signal_type.h
#	src/video/sdl2_v.cpp
This commit is contained in:
Jonathan G Rennison
2024-01-16 00:38:56 +00:00
parent 82d32fe40c 661bdae2e5
commit 0df59defc4
88 changed files with 417 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/signal_type.h
View File

@@ -23,8 +23,8 @@ enum SignalVariant {
/** Type of signal, i.e. how does the signal behave? */
enum SignalType : uint8_t {
SIGTYPE_NORMAL = 0, ///< normal signal
enum SignalType : byte {
SIGTYPE_BLOCK = 0, ///< block signal
SIGTYPE_ENTRY = 1, ///< presignal block entry
SIGTYPE_EXIT = 2, ///< presignal block exit
SIGTYPE_COMBO = 3, ///< presignal inter-block
@@ -38,7 +38,7 @@ enum SignalType : uint8_t {
SIGTYPE_FIRST_PBS_SPRITE = SIGTYPE_PBS,
};
/** Helper information for extract tool. */
template <> struct EnumPropsT<SignalType> : MakeEnumPropsT<SignalType, byte, SIGTYPE_NORMAL, SIGTYPE_END, SIGTYPE_END, 3> {};
template <> struct EnumPropsT<SignalType> : MakeEnumPropsT<SignalType, byte, SIGTYPE_BLOCK, SIGTYPE_END, SIGTYPE_END, 3> {};
/** Reference to a signal
*