Mercurial > hg > openttd
changeset 8761:30b1c1db062a draft
(svn r12457) -Codechange: Move signal enums on their own header.
author | belugas <belugas@openttd.org> |
---|---|
date | Fri, 28 Mar 2008 03:23:49 +0000 |
parents | 5819aa021719 |
children | dcc2194ac748 |
files | projects/openttd_vs80.vcproj projects/openttd_vs90.vcproj source.list src/rail_map.h src/signal_type.h |
diffstat | 5 files changed, 34 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -1256,6 +1256,10 @@ > </File> <File + RelativePath=".\..\src\signal_type.h" + > + </File> + <File RelativePath=".\..\src\signs.h" > </File>
--- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -1253,6 +1253,10 @@ > </File> <File + RelativePath=".\..\src\signal_type.h" + > + </File> + <File RelativePath=".\..\src\signs.h" > </File>
--- a/source.list +++ b/source.list @@ -222,6 +222,7 @@ settings_type.h ship.h signal_func.h +signal_type.h signs.h slope_func.h slope_type.h
--- a/src/rail_map.h +++ b/src/rail_map.h @@ -10,6 +10,7 @@ #include "direction_func.h" #include "track_func.h" #include "tile_map.h" +#include "signal_type.h" /** Different types of Rail-related tiles */ @@ -201,14 +202,6 @@ return (WaypointID)_m[t].m2; } -/** Type of signal, i.e. how does the signal behave? */ -enum SignalType { - SIGTYPE_NORMAL = 0, ///< normal signal - SIGTYPE_ENTRY = 1, ///< presignal block entry - SIGTYPE_EXIT = 2, ///< presignal block exit - SIGTYPE_COMBO = 3 ///< presignal inter-block -}; - static inline SignalType GetSignalType(TileIndex t, Track track) { assert(GetRailTileType(t) == RAIL_TILE_SIGNALS); @@ -244,12 +237,6 @@ SB(_m[t].m3, pos, 2, sig); } -/** Variant of the signal, i.e. how does the signal look? */ -enum SignalVariant { - SIG_ELECTRIC = 0, ///< Light signal - SIG_SEMAPHORE = 1 ///< Old-fashioned semaphore signal -}; - static inline SignalVariant GetSignalVariant(TileIndex t, Track track) { byte pos = (track == TRACK_LOWER || track == TRACK_RIGHT) ? 6 : 2;
new file mode 100644 --- /dev/null +++ b/src/signal_type.h @@ -0,0 +1,24 @@ +/* $Id$ */ + +/** @file signal_type.h Types and classes related to signals. */ + +#ifndef SIGNAL_TYPE_H +#define SIGNAL_TYPE_H + +/** Variant of the signal, i.e. how does the signal look? */ +enum SignalVariant { + SIG_ELECTRIC = 0, ///< Light signal + SIG_SEMAPHORE = 1 ///< Old-fashioned semaphore signal +}; + + +/** Type of signal, i.e. how does the signal behave? */ +enum SignalType { + SIGTYPE_NORMAL = 0, ///< normal signal + SIGTYPE_ENTRY = 1, ///< presignal block entry + SIGTYPE_EXIT = 2, ///< presignal block exit + SIGTYPE_COMBO = 3 ///< presignal inter-block +}; + + +#endif /* SIGNAL_TYPE_H */