(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)

- The only change is that the nsignalsw.grf file is kept and that existing nightlies with PBS signals get those signals converted to combo-signals.

1 files changed, 3 insertions, 4 deletions

diff --git a/rail.h b/rail.h
index f5c109994..c2dfbf207 100644
--- a/rail.h
+++ b/rail.h
@@ -42,14 +42,13 @@ typedef enum RailTileSubtypes {
 } RailTileSubtype;
 
 typedef enum SignalTypes {
-	/* Stored in m4[0..2] for MP_RAILWAY */
+	/* Stored in m4[0..1] for MP_RAILWAY */
 	SIGTYPE_NORMAL  = 0,        // normal signal
 	SIGTYPE_ENTRY   = 1,        // presignal block entry
 	SIGTYPE_EXIT    = 2,        // presignal block exit
 	SIGTYPE_COMBO   = 3,        // presignal inter-block
-	SIGTYPE_PBS     = 4,        // pbs signal
 	SIGTYPE_END,
-	SIGTYPE_MASK    = 7,
+	SIGTYPE_MASK    = 3,
 } SignalType;
 
 typedef enum RailTypes {
@@ -62,7 +61,7 @@ typedef enum RailTypes {
 } RailType;
 
 enum {
-	SIG_SEMAPHORE_MASK = 1 << 3,
+	SIG_SEMAPHORE_MASK = 1 << 2,
 };
 
 /** These are used to specify a single track. Can be translated to a trackbit