summaryrefslogtreecommitdiff
path: root/table
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-10-13 16:00:14 +0000
committertron <tron@openttd.org>2005-10-13 16:00:14 +0000
commit7520ef8f3325bcaec2496e52e0d351767193da28 (patch)
treeee9f710faeaacffe616dd886460d095de751bb0d /table
parentd37639ac3eab8c7d8deb37ff9b7784f57aa580d4 (diff)
downloadopenttd-7520ef8f3325bcaec2496e52e0d351767193da28.tar.xz
(svn r3037) Don't deduce the sprites for tunnels and level crossings from magic numbers, but fetch them from the central rail info array. This is a preparation step for electrified rails
Diffstat (limited to 'table')
-rw-r--r--table/sprites.h11
-rw-r--r--table/tunnel_land.h5
2 files changed, 9 insertions, 7 deletions
diff --git a/table/sprites.h b/table/sprites.h
index 1537a6b83..442282b33 100644
--- a/table/sprites.h
+++ b/table/sprites.h
@@ -407,8 +407,15 @@ enum Sprites {
SPR_SHIPLIFT_Y_DOWN_TOP_FRONT = SPR_CANALS_BASE + 32,
/* Sprites for tunnels and bridges */
- SPR_TUNNEL_ENTRY_REAR_RAIL = 2365,
- SPR_TUNNEL_ENTRY_REAR_ROAD = 2389,
+ SPR_TUNNEL_ENTRY_REAR_RAIL = 2365,
+ SPR_TUNNEL_ENTRY_REAR_MONO = 2373,
+ SPR_TUNNEL_ENTRY_REAR_MAGLEV = 2381,
+ SPR_TUNNEL_ENTRY_REAR_ROAD = 2389,
+
+ /* Level crossings */
+ SPR_CROSSING_OFF_X_RAIL = 1370,
+ SPR_CROSSING_OFF_X_MONO = 1382,
+ SPR_CROSSING_OFF_X_MAGLEV = 1394,
/* bridge type sprites */
diff --git a/table/tunnel_land.h b/table/tunnel_land.h
deleted file mode 100644
index db75c163c..000000000
--- a/table/tunnel_land.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* $Id$ */
-
-static const SpriteID _draw_tunnel_table_1[] = {
- 0x93D, 0x955,
-};