diff options
author | Darkvater <darkvater@openttd.org> | 2006-01-29 18:57:26 +0000 |
---|---|---|
committer | Darkvater <darkvater@openttd.org> | 2006-01-29 18:57:26 +0000 |
commit | 4e09974975ba47b755ac00b58aae880fa297e161 (patch) | |
tree | a71e925a12583a807b9e921fd125c8ae1b8e8721 /rail.h | |
parent | bb49381cd3ce8c95e459d1f542fc15064d7b17ea (diff) | |
download | openttd-4e09974975ba47b755ac00b58aae880fa297e161.tar.xz |
(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.
Diffstat (limited to 'rail.h')
-rw-r--r-- | rail.h | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -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 |