dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.

Browse Source
This commit is contained in:
celestar
2006-03-29 16:30:26 +00:00
parent f6662e056d
commit 6c44bf5012
42 changed files with 2258 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
table/sprites.h
View File

@@ -51,7 +51,8 @@ enum Sprites {
SPR_CANALS_BASE = 5382,
SPR_SLOPES_BASE = SPR_CANALS_BASE + 70,
SPR_AUTORAIL_BASE = SPR_SLOPES_BASE + 78,
SPR_2CCMAP_BASE = SPR_AUTORAIL_BASE + 55,
SPR_ELRAIL_BASE = SPR_AUTORAIL_BASE + 55,
SPR_2CCMAP_BASE = SPR_ELRAIL_BASE + 53,
SPR_OPENTTD_BASE = SPR_2CCMAP_BASE + 256,
SPR_BLOT = SPR_OPENTTD_BASE + 29, // colored circle (mainly used as vehicle profit marker and for sever compatibility)
@@ -206,6 +207,54 @@ enum Sprites {
OFFSET_TILEH_13 = 19,
OFFSET_TILEH_14 = 16,
/* Elrail stuff */
/* Wires. First identifier is the direction of the track, second is the required placement of the pylon.
"short" denotes a wire that requires a pylon on each end. Third identifier is the direction of the slope
(in positive coordinate direction) */
SPR_WIRE_X_SHORT = SPR_ELRAIL_BASE + 3,
SPR_WIRE_Y_SHORT = SPR_ELRAIL_BASE + 4,
SPR_WIRE_EW_SHORT = SPR_ELRAIL_BASE + 5,
SPR_WIRE_NS_SHORT = SPR_ELRAIL_BASE + 6,
SPR_WIRE_X_SHORT_DOWN = SPR_ELRAIL_BASE + 7,
SPR_WIRE_Y_SHORT_UP = SPR_ELRAIL_BASE + 8,
SPR_WIRE_X_SHORT_UP = SPR_ELRAIL_BASE + 9,
SPR_WIRE_Y_SHORT_DOWN = SPR_ELRAIL_BASE + 10,
SPR_WIRE_X_SW = SPR_ELRAIL_BASE + 11,
SPR_WIRE_Y_SE = SPR_ELRAIL_BASE + 12,
SPR_WIRE_EW_E = SPR_ELRAIL_BASE + 13,
SPR_WIRE_NS_S = SPR_ELRAIL_BASE + 14,
SPR_WIRE_X_SW_DOWN = SPR_ELRAIL_BASE + 15,
SPR_WIRE_Y_SE_UP = SPR_ELRAIL_BASE + 16,
SPR_WIRE_X_SW_UP = SPR_ELRAIL_BASE + 17,
SPR_WIRE_Y_SE_DOWN = SPR_ELRAIL_BASE + 18,
SPR_WIRE_X_NE = SPR_ELRAIL_BASE + 19,
SPR_WIRE_Y_NW = SPR_ELRAIL_BASE + 20,
SPR_WIRE_EW_W = SPR_ELRAIL_BASE + 21,
SPR_WIRE_NS_N = SPR_ELRAIL_BASE + 22,
SPR_WIRE_X_NE_DOWN = SPR_ELRAIL_BASE + 23,
SPR_WIRE_Y_NW_UP = SPR_ELRAIL_BASE + 24,
SPR_WIRE_X_NE_UP = SPR_ELRAIL_BASE + 25,
SPR_WIRE_Y_NW_DOWN = SPR_ELRAIL_BASE + 26,
/* Tunnel entries */
SPR_WIRE_DEPOT_SW = SPR_ELRAIL_BASE + 27,
SPR_WIRE_DEPOT_NW = SPR_ELRAIL_BASE + 28,
SPR_WIRE_DEPOT_NE = SPR_ELRAIL_BASE + 29,
SPR_WIRE_DEPOT_SE = SPR_ELRAIL_BASE + 30,
/* Pylons, first identifier is the direction of the track, second the placement relative to the track */
SPR_PYLON_Y_NE = SPR_ELRAIL_BASE + 31,
SPR_PYLON_Y_SW = SPR_ELRAIL_BASE + 32,
SPR_PYLON_X_NW = SPR_ELRAIL_BASE + 33,
SPR_PYLON_X_SE = SPR_ELRAIL_BASE + 34,
SPR_PYLON_EW_N = SPR_ELRAIL_BASE + 35,
SPR_PYLON_EW_S = SPR_ELRAIL_BASE + 36,
SPR_PYLON_NS_W = SPR_ELRAIL_BASE + 37,
SPR_PYLON_NS_E = SPR_ELRAIL_BASE + 38,
/* sprites for airports and airfields*/
/* Small airports are AIRFIELD, everything else is AIRPORT */
SPR_HELIPORT = 2633,
@@ -955,6 +1004,13 @@ enum Sprites {
SPR_BUBBLE_ABSORB_3 = 4761,
SPR_BUBBLE_ABSORB_4 = 4762,
/* Electrified rail build menu */
SPR_BUILD_NS_ELRAIL = SPR_ELRAIL_BASE + 39,
SPR_BUILD_X_ELRAIL = SPR_ELRAIL_BASE + 40,
SPR_BUILD_EW_ELRAIL = SPR_ELRAIL_BASE + 41,
SPR_BUILD_Y_ELRAIL = SPR_ELRAIL_BASE + 42,
SPR_BUILD_TUNNEL_ELRAIL = SPR_ELRAIL_BASE + 47,
/* road_gui.c */
SPR_IMG_ROAD_NW = 1309,
SPR_IMG_ROAD_NE = 1310,
@@ -1034,9 +1090,15 @@ typedef enum CursorSprites {
SPR_CURSOR_EW_MAGLEV = 1273,
SPR_CURSOR_NWSE_MAGLEV = 1274,
SPR_CURSOR_NS_ELRAIL = SPR_ELRAIL_BASE + 43,
SPR_CURSOR_SWNE_ELRAIL = SPR_ELRAIL_BASE + 44,
SPR_CURSOR_EW_ELRAIL = SPR_ELRAIL_BASE + 45,
SPR_CURSOR_NWSE_ELRAIL = SPR_ELRAIL_BASE + 46,
SPR_CURSOR_RAIL_STATION = 1300,
SPR_CURSOR_TUNNEL_RAIL = 2434,
SPR_CURSOR_TUNNEL_ELRAIL = SPR_ELRAIL_BASE + 48,
SPR_CURSOR_TUNNEL_MONO = 2435,
SPR_CURSOR_TUNNEL_MAGLEV = 2436,