(svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions

1 files changed, 19 insertions, 0 deletions

diff --git a/rail_map.h b/rail_map.h
index 2b09faf45..54f766206 100644
--- a/rail_map.h
+++ b/rail_map.h
@@ -211,6 +211,25 @@ static inline void SetSignalVariant(TileIndex t, SignalVariant v)
 	SB(_m[t].m4, 2, 1, v);
 }
 
+static inline bool IsSignalPresent(TileIndex t, byte signalbit)
+{
+	return HASBIT(_m[t].m3, signalbit + 4);
+}
+
+/** These are states in which a signal can be. Currently these are only two, so
+ * simple boolean logic will do. But do try to compare to this enum instead of
+ * normal boolean evaluation, since that will make future additions easier.
+ */
+typedef enum SignalStates {
+	SIGNAL_STATE_RED = 0,
+	SIGNAL_STATE_GREEN = 1,
+} SignalState;
+
+static inline SignalState GetSingleSignalState(TileIndex t, byte signalbit)
+{
+	return HASBIT(_m[t].m2, signalbit + 4);
+}
+
 
 typedef enum RailGroundType {
 	RAIL_MAP2LO_GROUND_MASK = 0xF,