openttd-ottdgrfs: comparison src/table/elrail

equal deleted inserted replaced

-:70d78ac95d6c
+:7bd07f43b0e3
 #ifndef ELRAIL_DATA_H
 #define ELRAIL_DATA_H
 /** Tile Location group.
 * This defines whether the X and or Y coordinate of a tile is even */
-typedef enum TLG {
+enum TLG {
 	XEVEN_YEVEN = 0,
 	XEVEN_YODD  = 1,
 	XODD_YEVEN  = 2,
 	XODD_YODD   = 3,
 	TLG_END
-} TLG;
+};
 /** When determining the pylon configuration on the edge, two tiles are taken
 * into account: the tile being drawn itself (the home tile, the one in
 * ti->tile), and the neighbouring tile */
-typedef enum {
+enum TileSource {
 	TS_HOME      = 0,
 	TS_NEIGHBOUR = 1,
 	TS_END
-} TileSource;
+};
 enum {
 	NUM_TRACKS_AT_PCP = 6
 };
 	SPR_PYLON_X_SE,
 	SPR_PYLON_Y_NE,
 	SPR_PYLON_Y_SW
 };
-typedef struct {
+struct SortableSpriteStruct {
 	SpriteID image;
 	int8 x_offset;
 	int8 y_offset;
 	int8 x_size;
 	int8 y_size;
 	int8 z_size;
 	int8 z_offset;
-} SortableSpriteStruct;
+};
 enum {
 	/** Distance between wire and rail */
 	ELRAIL_ELEVATION = 8,
 	/** Corrects an off-by-one error in some places (tileh 12 and 9) (TODO -- find source of error) */
 	{ SPR_WIRE_DEPOT_NE,      0,  8,  8,  1,  1, ELRAIL_ELEVATION }, //! Wire for NE depot exit
 	{ SPR_WIRE_DEPOT_SE,      8,  0,  1,  8,  1, ELRAIL_ELEVATION }, //! Wire for SE depot exit
 	{ SPR_WIRE_DEPOT_SW,      0,  8,  8,  1,  1, ELRAIL_ELEVATION }, //! Wire for SW depot exit
 	{ SPR_WIRE_DEPOT_NW,      8,  0,  1,  8,  1, ELRAIL_ELEVATION }  //! Wire for NW depot exit
 };
+static const SortableSpriteStruct CatenarySpriteData_Tunnel[] = {
+	{ SPR_WIRE_TUNNEL_NE,      0,  8,  8,  1,  1, ELRAIL_ELEVATION }, //! Wire for NE tunnel exit
+	{ SPR_WIRE_TUNNEL_SE,      8,  0,  1,  8,  1, ELRAIL_ELEVATION }, //! Wire for SE tunnel exit
+	{ SPR_WIRE_TUNNEL_SW,      0,  8,  8,  1,  1, ELRAIL_ELEVATION }, //! Wire for SW tunnel exit
+	{ SPR_WIRE_TUNNEL_NW,      8,  0,  1,  8,  1, ELRAIL_ELEVATION }  //! Wire for NW tunnel exit
+};
 /** Refers to a certain element of the catenary.
 * Identifiers for Wires:
 * <ol><li>Direction of the wire</li>
 * <li>Slope of the tile for diagonals, placement inside the track for horiz/vertical pieces</li>
 * <ol><li>Direction of the wire</li>
 * <li>Slope of the tile</li>
 * <li>Position of the Pylon relative to the track</li>
 * <li>Position of the Pylon inside the tile</li></ol>
 */
-typedef enum {
+enum CatenarySprite {
 	WIRE_X_FLAT_SW,
 	WIRE_X_FLAT_NE,
 	WIRE_X_FLAT_BOTH,
 	WIRE_X_UP_SW,
 	WIRE_EW_N_E,
 	WIRE_EW_S_E,
 	INVALID_CATENARY = 0xFF
-} CatenarySprite;
+};
 /* Selects a Wire (with white and grey ends) depending on whether:
 * a) none (should never happen)
 * b) the first
 * c) the second

branch	gamebalance
changeset 9895	7bd07f43b0e3
parent 5726	8f399788f6c9