summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbelugas <belugas@openttd.org>2008-03-05 11:41:26 +0000
committerbelugas <belugas@openttd.org>2008-03-05 11:41:26 +0000
commitcd411ab75aa65bec950f1922e0429f0d96c22b66 (patch)
treee0fd1224526b52d86fc937667bf54e49d3d0c84b /src
parentf08cf322163e3b3f67d5133334c31269b036e99d (diff)
downloadopenttd-cd411ab75aa65bec950f1922e0429f0d96c22b66.tar.xz
(svn r12342) -Fix(r12340): In order to avoid confusion, SIGN should be used for signs and SIGNAL for signals :)
Always check your terms with your nearest british ;)
Diffstat (limited to 'src')
-rw-r--r--src/rail_cmd.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index 277dd9b54..118551c2e 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -1705,14 +1705,14 @@ static void DrawTrackBits(TileInfo* ti, TrackBits track)
* green state sprite, all signal sprites being in pair,
* starting with the off-red state */
enum {
- SIGN_TO_SOUTHWEST = 0,
- SIGN_TO_NORTHEAST = 2,
- SIGN_TO_SOUTHEAST = 4,
- SIGN_TO_NORTHWEST = 6,
- SIGN_TO_EAST = 8,
- SIGN_TO_WEST = 10,
- SIGN_TO_SOUTH = 12,
- SIGN_TO_NORTH = 14,
+ SIGNAL_TO_SOUTHWEST = 0,
+ SIGNAL_TO_NORTHEAST = 2,
+ SIGNAL_TO_SOUTHEAST = 4,
+ SIGNAL_TO_NORTHWEST = 6,
+ SIGNAL_TO_EAST = 8,
+ SIGNAL_TO_WEST = 10,
+ SIGNAL_TO_SOUTH = 12,
+ SIGNAL_TO_NORTH = 14,
};
static void DrawSignals(TileIndex tile, TrackBits rails)
@@ -1722,28 +1722,28 @@ static void DrawSignals(TileIndex tile, TrackBits rails)
if (!(rails & TRACK_BIT_Y)) {
if (!(rails & TRACK_BIT_X)) {
if (rails & TRACK_BIT_LEFT) {
- MAYBE_DRAW_SIGNAL(2, SIGN_TO_NORTH, 0, TRACK_LEFT);
- MAYBE_DRAW_SIGNAL(3, SIGN_TO_SOUTH, 1, TRACK_LEFT);
+ MAYBE_DRAW_SIGNAL(2, SIGNAL_TO_NORTH, 0, TRACK_LEFT);
+ MAYBE_DRAW_SIGNAL(3, SIGNAL_TO_SOUTH, 1, TRACK_LEFT);
}
if (rails & TRACK_BIT_RIGHT) {
- MAYBE_DRAW_SIGNAL(0, SIGN_TO_NORTH, 2, TRACK_RIGHT);
- MAYBE_DRAW_SIGNAL(1, SIGN_TO_SOUTH, 3, TRACK_RIGHT);
+ MAYBE_DRAW_SIGNAL(0, SIGNAL_TO_NORTH, 2, TRACK_RIGHT);
+ MAYBE_DRAW_SIGNAL(1, SIGNAL_TO_SOUTH, 3, TRACK_RIGHT);
}
if (rails & TRACK_BIT_UPPER) {
- MAYBE_DRAW_SIGNAL(3, SIGN_TO_WEST, 4, TRACK_UPPER);
- MAYBE_DRAW_SIGNAL(2, SIGN_TO_EAST, 5, TRACK_UPPER);
+ MAYBE_DRAW_SIGNAL(3, SIGNAL_TO_WEST, 4, TRACK_UPPER);
+ MAYBE_DRAW_SIGNAL(2, SIGNAL_TO_EAST, 5, TRACK_UPPER);
}
if (rails & TRACK_BIT_LOWER) {
- MAYBE_DRAW_SIGNAL(1, SIGN_TO_WEST, 6, TRACK_LOWER);
- MAYBE_DRAW_SIGNAL(0, SIGN_TO_EAST, 7, TRACK_LOWER);
+ MAYBE_DRAW_SIGNAL(1, SIGNAL_TO_WEST, 6, TRACK_LOWER);
+ MAYBE_DRAW_SIGNAL(0, SIGNAL_TO_EAST, 7, TRACK_LOWER);
}
} else {
- MAYBE_DRAW_SIGNAL(3, SIGN_TO_SOUTHWEST, 8, TRACK_X);
- MAYBE_DRAW_SIGNAL(2, SIGN_TO_NORTHEAST, 9, TRACK_X);
+ MAYBE_DRAW_SIGNAL(3, SIGNAL_TO_SOUTHWEST, 8, TRACK_X);
+ MAYBE_DRAW_SIGNAL(2, SIGNAL_TO_NORTHEAST, 9, TRACK_X);
}
} else {
- MAYBE_DRAW_SIGNAL(3, SIGN_TO_SOUTHEAST, 10, TRACK_Y);
- MAYBE_DRAW_SIGNAL(2, SIGN_TO_NORTHWEST, 11, TRACK_Y);
+ MAYBE_DRAW_SIGNAL(3, SIGNAL_TO_SOUTHEAST, 10, TRACK_Y);
+ MAYBE_DRAW_SIGNAL(2, SIGNAL_TO_NORTHWEST, 11, TRACK_Y);
}
}