author | rubidium |
Thu, 01 Feb 2007 15:49:12 +0000 | |
changeset 5893 | 7e431a4abebb |
parent 5587 | 167d9a91ef02 |
child 6154 | 8f4c65bdf930 |
permissions | -rw-r--r-- |
3101
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
1 |
/* $Id$ */ |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
2 |
|
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
3 |
#ifndef RAIL_MAP_H |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
4 |
#define RAIL_MAP_H |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
5 |
|
3239
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
6 |
#include "direction.h" |
4041
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
7 |
#include "rail.h" |
3101
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
8 |
#include "tile.h" |
3239
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
9 |
|
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
10 |
|
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
11 |
typedef enum RailTileType { |
3792
67c865c9315c
(svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity
rubidium
parents:
3772
diff
changeset
|
12 |
RAIL_TILE_NORMAL = 0x0, |
67c865c9315c
(svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity
rubidium
parents:
3772
diff
changeset
|
13 |
RAIL_TILE_SIGNALS = 0x40, |
67c865c9315c
(svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity
rubidium
parents:
3772
diff
changeset
|
14 |
RAIL_TILE_UNUSED = 0x80, /* XXX: Maybe this could become waypoints? */ |
67c865c9315c
(svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity
rubidium
parents:
3772
diff
changeset
|
15 |
RAIL_TILE_DEPOT_WAYPOINT = 0xC0, /* Is really depots and waypoints... */ |
3239
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
16 |
RAIL_TILE_TYPE_MASK = 0xC0 |
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
17 |
} RailTileType; |
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
18 |
|
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
19 |
static inline RailTileType GetRailTileType(TileIndex t) |
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
20 |
{ |
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
21 |
assert(IsTileType(t, MP_RAILWAY)); |
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3792
diff
changeset
|
22 |
return (RailTileType)(_m[t].m5 & RAIL_TILE_TYPE_MASK); |
3239
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
23 |
} |
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
24 |
|
3772
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
25 |
/** |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
26 |
* Returns whether this is plain rails, with or without signals. Iow, if this |
3792
67c865c9315c
(svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity
rubidium
parents:
3772
diff
changeset
|
27 |
* tiles RailTileType is RAIL_TILE_NORMAL or RAIL_TILE_SIGNALS. |
3772
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
28 |
*/ |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
29 |
static inline bool IsPlainRailTile(TileIndex tile) |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
30 |
{ |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
31 |
RailTileType rtt = GetRailTileType(tile); |
3792
67c865c9315c
(svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity
rubidium
parents:
3772
diff
changeset
|
32 |
return rtt == RAIL_TILE_NORMAL || rtt == RAIL_TILE_SIGNALS; |
3772
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
33 |
} |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
34 |
|
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
35 |
/** |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
36 |
* Checks if a rail tile has signals. |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
37 |
*/ |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
38 |
static inline bool HasSignals(TileIndex tile) |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
39 |
{ |
3792
67c865c9315c
(svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity
rubidium
parents:
3772
diff
changeset
|
40 |
return GetRailTileType(tile) == RAIL_TILE_SIGNALS; |
3772
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
41 |
} |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
42 |
|
3239
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
43 |
|
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
44 |
/** These specify the subtype when the main rail type is |
3792
67c865c9315c
(svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity
rubidium
parents:
3772
diff
changeset
|
45 |
* RAIL_TILE_DEPOT_WAYPOINT */ |
3239
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
46 |
typedef enum RailTileSubtypes { |
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
47 |
RAIL_SUBTYPE_DEPOT = 0x00, |
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
48 |
RAIL_SUBTYPE_WAYPOINT = 0x04, |
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
49 |
RAIL_SUBTYPE_MASK = 0x3C |
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
50 |
} RailTileSubtype; |
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
51 |
|
3772
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
52 |
/** |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
53 |
* Returns the RailTileSubtype of a given rail tile with type |
3792
67c865c9315c
(svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity
rubidium
parents:
3772
diff
changeset
|
54 |
* RAIL_TILE_DEPOT_WAYPOINT |
3772
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
55 |
*/ |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
56 |
static inline RailTileSubtype GetRailTileSubtype(TileIndex tile) |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
57 |
{ |
3792
67c865c9315c
(svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity
rubidium
parents:
3772
diff
changeset
|
58 |
assert(GetRailTileType(tile) == RAIL_TILE_DEPOT_WAYPOINT); |
3772
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
59 |
return (RailTileSubtype)(_m[tile].m5 & RAIL_SUBTYPE_MASK); |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
60 |
} |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
61 |
|
3239
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
62 |
|
4182
48dba107ff43
(svn r5624) Use {IsPlainRailTile,IsRailDepot,IsRailWaypoint,HasSignals}() instead of GetRailTile{T,Subt}ype() - this is more concise and a bit more flexible if/when the rail tile encoding changes
tron
parents:
4158
diff
changeset
|
63 |
static inline bool IsRailDepot(TileIndex t) |
48dba107ff43
(svn r5624) Use {IsPlainRailTile,IsRailDepot,IsRailWaypoint,HasSignals}() instead of GetRailTile{T,Subt}ype() - this is more concise and a bit more flexible if/when the rail tile encoding changes
tron
parents:
4158
diff
changeset
|
64 |
{ |
48dba107ff43
(svn r5624) Use {IsPlainRailTile,IsRailDepot,IsRailWaypoint,HasSignals}() instead of GetRailTile{T,Subt}ype() - this is more concise and a bit more flexible if/when the rail tile encoding changes
tron
parents:
4158
diff
changeset
|
65 |
return |
48dba107ff43
(svn r5624) Use {IsPlainRailTile,IsRailDepot,IsRailWaypoint,HasSignals}() instead of GetRailTile{T,Subt}ype() - this is more concise and a bit more flexible if/when the rail tile encoding changes
tron
parents:
4158
diff
changeset
|
66 |
GetRailTileType(t) == RAIL_TILE_DEPOT_WAYPOINT && |
48dba107ff43
(svn r5624) Use {IsPlainRailTile,IsRailDepot,IsRailWaypoint,HasSignals}() instead of GetRailTile{T,Subt}ype() - this is more concise and a bit more flexible if/when the rail tile encoding changes
tron
parents:
4158
diff
changeset
|
67 |
GetRailTileSubtype(t) == RAIL_SUBTYPE_DEPOT; |
48dba107ff43
(svn r5624) Use {IsPlainRailTile,IsRailDepot,IsRailWaypoint,HasSignals}() instead of GetRailTile{T,Subt}ype() - this is more concise and a bit more flexible if/when the rail tile encoding changes
tron
parents:
4158
diff
changeset
|
68 |
} |
48dba107ff43
(svn r5624) Use {IsPlainRailTile,IsRailDepot,IsRailWaypoint,HasSignals}() instead of GetRailTile{T,Subt}ype() - this is more concise and a bit more flexible if/when the rail tile encoding changes
tron
parents:
4158
diff
changeset
|
69 |
|
48dba107ff43
(svn r5624) Use {IsPlainRailTile,IsRailDepot,IsRailWaypoint,HasSignals}() instead of GetRailTile{T,Subt}ype() - this is more concise and a bit more flexible if/when the rail tile encoding changes
tron
parents:
4158
diff
changeset
|
70 |
|
4044
8db2992cb412
(svn r5313) Move IsRailWaypoint() to rail_map.h and remove unused enum
tron
parents:
4041
diff
changeset
|
71 |
static inline bool IsRailWaypoint(TileIndex t) |
8db2992cb412
(svn r5313) Move IsRailWaypoint() to rail_map.h and remove unused enum
tron
parents:
4041
diff
changeset
|
72 |
{ |
8db2992cb412
(svn r5313) Move IsRailWaypoint() to rail_map.h and remove unused enum
tron
parents:
4041
diff
changeset
|
73 |
return |
8db2992cb412
(svn r5313) Move IsRailWaypoint() to rail_map.h and remove unused enum
tron
parents:
4041
diff
changeset
|
74 |
GetRailTileType(t) == RAIL_TILE_DEPOT_WAYPOINT && |
8db2992cb412
(svn r5313) Move IsRailWaypoint() to rail_map.h and remove unused enum
tron
parents:
4041
diff
changeset
|
75 |
GetRailTileSubtype(t) == RAIL_SUBTYPE_WAYPOINT; |
8db2992cb412
(svn r5313) Move IsRailWaypoint() to rail_map.h and remove unused enum
tron
parents:
4041
diff
changeset
|
76 |
} |
8db2992cb412
(svn r5313) Move IsRailWaypoint() to rail_map.h and remove unused enum
tron
parents:
4041
diff
changeset
|
77 |
|
8db2992cb412
(svn r5313) Move IsRailWaypoint() to rail_map.h and remove unused enum
tron
parents:
4041
diff
changeset
|
78 |
|
3239
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
79 |
static inline RailType GetRailType(TileIndex t) |
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
80 |
{ |
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
81 |
return (RailType)GB(_m[t].m3, 0, 4); |
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
82 |
} |
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
83 |
|
3242
4c32bf21153b
(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()
tron
parents:
3239
diff
changeset
|
84 |
// TODO remove this by moving to the same bits as GetRailType() |
4c32bf21153b
(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()
tron
parents:
3239
diff
changeset
|
85 |
static inline RailType GetRailTypeCrossing(TileIndex t) |
4c32bf21153b
(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()
tron
parents:
3239
diff
changeset
|
86 |
{ |
4c32bf21153b
(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()
tron
parents:
3239
diff
changeset
|
87 |
return (RailType)GB(_m[t].m4, 0, 4); |
4c32bf21153b
(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()
tron
parents:
3239
diff
changeset
|
88 |
} |
4c32bf21153b
(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()
tron
parents:
3239
diff
changeset
|
89 |
|
4c32bf21153b
(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()
tron
parents:
3239
diff
changeset
|
90 |
static inline void SetRailType(TileIndex t, RailType r) |
4c32bf21153b
(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()
tron
parents:
3239
diff
changeset
|
91 |
{ |
4c32bf21153b
(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()
tron
parents:
3239
diff
changeset
|
92 |
SB(_m[t].m3, 0, 4, r); |
4c32bf21153b
(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()
tron
parents:
3239
diff
changeset
|
93 |
} |
4c32bf21153b
(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()
tron
parents:
3239
diff
changeset
|
94 |
|
4c32bf21153b
(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()
tron
parents:
3239
diff
changeset
|
95 |
// TODO remove this by moving to the same bits as SetRailType() |
4c32bf21153b
(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()
tron
parents:
3239
diff
changeset
|
96 |
static inline void SetRailTypeCrossing(TileIndex t, RailType r) |
4c32bf21153b
(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()
tron
parents:
3239
diff
changeset
|
97 |
{ |
4c32bf21153b
(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()
tron
parents:
3239
diff
changeset
|
98 |
SB(_m[t].m4, 0, 4, r); |
4c32bf21153b
(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()
tron
parents:
3239
diff
changeset
|
99 |
} |
4c32bf21153b
(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()
tron
parents:
3239
diff
changeset
|
100 |
|
3239
9b1030ac7d83
(svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round
tron
parents:
3238
diff
changeset
|
101 |
|
3267
feff95208a9f
(svn r3979) Move GetRailFoundation() to rail_map.h and use it and friends to get information about rail tiles
tron
parents:
3258
diff
changeset
|
102 |
static inline TrackBits GetTrackBits(TileIndex tile) |
feff95208a9f
(svn r3979) Move GetRailFoundation() to rail_map.h and use it and friends to get information about rail tiles
tron
parents:
3258
diff
changeset
|
103 |
{ |
feff95208a9f
(svn r3979) Move GetRailFoundation() to rail_map.h and use it and friends to get information about rail tiles
tron
parents:
3258
diff
changeset
|
104 |
return (TrackBits)GB(_m[tile].m5, 0, 6); |
feff95208a9f
(svn r3979) Move GetRailFoundation() to rail_map.h and use it and friends to get information about rail tiles
tron
parents:
3258
diff
changeset
|
105 |
} |
feff95208a9f
(svn r3979) Move GetRailFoundation() to rail_map.h and use it and friends to get information about rail tiles
tron
parents:
3258
diff
changeset
|
106 |
|
3273
3089ecca8e21
(svn r3985) Make CmdBuildSingleRail() a bit more comprehensible
tron
parents:
3267
diff
changeset
|
107 |
static inline void SetTrackBits(TileIndex t, TrackBits b) |
3089ecca8e21
(svn r3985) Make CmdBuildSingleRail() a bit more comprehensible
tron
parents:
3267
diff
changeset
|
108 |
{ |
3089ecca8e21
(svn r3985) Make CmdBuildSingleRail() a bit more comprehensible
tron
parents:
3267
diff
changeset
|
109 |
SB(_m[t].m5, 0, 6, b); |
3089ecca8e21
(svn r3985) Make CmdBuildSingleRail() a bit more comprehensible
tron
parents:
3267
diff
changeset
|
110 |
} |
3089ecca8e21
(svn r3985) Make CmdBuildSingleRail() a bit more comprehensible
tron
parents:
3267
diff
changeset
|
111 |
|
3772
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
112 |
/** |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
113 |
* Returns whether the given track is present on the given tile. Tile must be |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
114 |
* a plain rail tile (IsPlainRailTile()). |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
115 |
*/ |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
116 |
static inline bool HasTrack(TileIndex tile, Track track) |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
117 |
{ |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
118 |
return HASBIT(GetTrackBits(tile), track); |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
119 |
} |
f2cf079d7afe
(svn r4764) Move some functions from rail.h to rail_map.h
tron
parents:
3575
diff
changeset
|
120 |
|
3101
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
121 |
|
3185 | 122 |
static inline DiagDirection GetRailDepotDirection(TileIndex t) |
123 |
{ |
|
124 |
return (DiagDirection)GB(_m[t].m5, 0, 2); |
|
125 |
} |
|
126 |
||
4158 | 127 |
|
128 |
static inline Axis GetWaypointAxis(TileIndex t) |
|
129 |
{ |
|
4474
973c48d699bd
(svn r6259) Extract the axis directly, don't use a trinary operator
tron
parents:
4466
diff
changeset
|
130 |
return (Axis)GB(_m[t].m5, 0, 1); |
4158 | 131 |
} |
132 |
||
3453 | 133 |
static inline Track GetRailWaypointTrack(TileIndex t) |
3448
bc96e486627d
(svn r4280) -Codechange: Add and make use of map accessors concerning railway waypoints
celestar
parents:
3355
diff
changeset
|
134 |
{ |
4158 | 135 |
return AxisToTrack(GetWaypointAxis(t)); |
3448
bc96e486627d
(svn r4280) -Codechange: Add and make use of map accessors concerning railway waypoints
celestar
parents:
3355
diff
changeset
|
136 |
} |
3185 | 137 |
|
3101
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
138 |
static inline TrackBits GetRailWaypointBits(TileIndex t) |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
139 |
{ |
4158 | 140 |
return TrackToTrackBits(GetRailWaypointTrack(t)); |
3528 | 141 |
} |
142 |
||
3101
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
143 |
|
3238
9ebec0a611ee
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
tron
parents:
3237
diff
changeset
|
144 |
typedef enum SignalType { |
9ebec0a611ee
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
tron
parents:
3237
diff
changeset
|
145 |
SIGTYPE_NORMAL = 0, // normal signal |
9ebec0a611ee
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
tron
parents:
3237
diff
changeset
|
146 |
SIGTYPE_ENTRY = 1, // presignal block entry |
9ebec0a611ee
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
tron
parents:
3237
diff
changeset
|
147 |
SIGTYPE_EXIT = 2, // presignal block exit |
9ebec0a611ee
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
tron
parents:
3237
diff
changeset
|
148 |
SIGTYPE_COMBO = 3 // presignal inter-block |
9ebec0a611ee
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
tron
parents:
3237
diff
changeset
|
149 |
} SignalType; |
9ebec0a611ee
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
tron
parents:
3237
diff
changeset
|
150 |
|
9ebec0a611ee
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
tron
parents:
3237
diff
changeset
|
151 |
static inline SignalType GetSignalType(TileIndex t) |
9ebec0a611ee
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
tron
parents:
3237
diff
changeset
|
152 |
{ |
3792
67c865c9315c
(svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity
rubidium
parents:
3772
diff
changeset
|
153 |
assert(GetRailTileType(t) == RAIL_TILE_SIGNALS); |
3238
9ebec0a611ee
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
tron
parents:
3237
diff
changeset
|
154 |
return (SignalType)GB(_m[t].m4, 0, 2); |
9ebec0a611ee
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
tron
parents:
3237
diff
changeset
|
155 |
} |
9ebec0a611ee
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
tron
parents:
3237
diff
changeset
|
156 |
|
9ebec0a611ee
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
tron
parents:
3237
diff
changeset
|
157 |
static inline void SetSignalType(TileIndex t, SignalType s) |
9ebec0a611ee
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
tron
parents:
3237
diff
changeset
|
158 |
{ |
3792
67c865c9315c
(svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity
rubidium
parents:
3772
diff
changeset
|
159 |
assert(GetRailTileType(t) == RAIL_TILE_SIGNALS); |
3238
9ebec0a611ee
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
tron
parents:
3237
diff
changeset
|
160 |
SB(_m[t].m4, 0, 2, s); |
9ebec0a611ee
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
tron
parents:
3237
diff
changeset
|
161 |
} |
9ebec0a611ee
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
tron
parents:
3237
diff
changeset
|
162 |
|
3521
addbba7b20ff
(svn r4377) -Add and make use of a function that finds out whether a signal is an entry or and exit signal to a presignal block (as combos act as both)
celestar
parents:
3453
diff
changeset
|
163 |
static inline bool IsPresignalEntry(TileIndex t) |
addbba7b20ff
(svn r4377) -Add and make use of a function that finds out whether a signal is an entry or and exit signal to a presignal block (as combos act as both)
celestar
parents:
3453
diff
changeset
|
164 |
{ |
addbba7b20ff
(svn r4377) -Add and make use of a function that finds out whether a signal is an entry or and exit signal to a presignal block (as combos act as both)
celestar
parents:
3453
diff
changeset
|
165 |
return GetSignalType(t) == SIGTYPE_ENTRY || GetSignalType(t) == SIGTYPE_COMBO; |
addbba7b20ff
(svn r4377) -Add and make use of a function that finds out whether a signal is an entry or and exit signal to a presignal block (as combos act as both)
celestar
parents:
3453
diff
changeset
|
166 |
} |
addbba7b20ff
(svn r4377) -Add and make use of a function that finds out whether a signal is an entry or and exit signal to a presignal block (as combos act as both)
celestar
parents:
3453
diff
changeset
|
167 |
|
addbba7b20ff
(svn r4377) -Add and make use of a function that finds out whether a signal is an entry or and exit signal to a presignal block (as combos act as both)
celestar
parents:
3453
diff
changeset
|
168 |
static inline bool IsPresignalExit(TileIndex t) |
addbba7b20ff
(svn r4377) -Add and make use of a function that finds out whether a signal is an entry or and exit signal to a presignal block (as combos act as both)
celestar
parents:
3453
diff
changeset
|
169 |
{ |
addbba7b20ff
(svn r4377) -Add and make use of a function that finds out whether a signal is an entry or and exit signal to a presignal block (as combos act as both)
celestar
parents:
3453
diff
changeset
|
170 |
return GetSignalType(t) == SIGTYPE_EXIT || GetSignalType(t) == SIGTYPE_COMBO; |
addbba7b20ff
(svn r4377) -Add and make use of a function that finds out whether a signal is an entry or and exit signal to a presignal block (as combos act as both)
celestar
parents:
3453
diff
changeset
|
171 |
} |
addbba7b20ff
(svn r4377) -Add and make use of a function that finds out whether a signal is an entry or and exit signal to a presignal block (as combos act as both)
celestar
parents:
3453
diff
changeset
|
172 |
|
3522
888ac5081c6e
(svn r4378) -Add and make use of an accessor function two-way => one-way => one-way => two-way signal cycling
celestar
parents:
3521
diff
changeset
|
173 |
static inline void CycleSignalSide(TileIndex t, Track track) |
888ac5081c6e
(svn r4378) -Add and make use of an accessor function two-way => one-way => one-way => two-way signal cycling
celestar
parents:
3521
diff
changeset
|
174 |
{ |
888ac5081c6e
(svn r4378) -Add and make use of an accessor function two-way => one-way => one-way => two-way signal cycling
celestar
parents:
3521
diff
changeset
|
175 |
byte sig; |
888ac5081c6e
(svn r4378) -Add and make use of an accessor function two-way => one-way => one-way => two-way signal cycling
celestar
parents:
3521
diff
changeset
|
176 |
byte pos = 6; |
888ac5081c6e
(svn r4378) -Add and make use of an accessor function two-way => one-way => one-way => two-way signal cycling
celestar
parents:
3521
diff
changeset
|
177 |
if (track == TRACK_LOWER || track == TRACK_RIGHT) pos = 4; |
888ac5081c6e
(svn r4378) -Add and make use of an accessor function two-way => one-way => one-way => two-way signal cycling
celestar
parents:
3521
diff
changeset
|
178 |
|
888ac5081c6e
(svn r4378) -Add and make use of an accessor function two-way => one-way => one-way => two-way signal cycling
celestar
parents:
3521
diff
changeset
|
179 |
sig = GB(_m[t].m3, pos, 2); |
888ac5081c6e
(svn r4378) -Add and make use of an accessor function two-way => one-way => one-way => two-way signal cycling
celestar
parents:
3521
diff
changeset
|
180 |
if (--sig == 0) sig = 3; |
888ac5081c6e
(svn r4378) -Add and make use of an accessor function two-way => one-way => one-way => two-way signal cycling
celestar
parents:
3521
diff
changeset
|
181 |
SB(_m[t].m3, pos, 2, sig); |
888ac5081c6e
(svn r4378) -Add and make use of an accessor function two-way => one-way => one-way => two-way signal cycling
celestar
parents:
3521
diff
changeset
|
182 |
} |
888ac5081c6e
(svn r4378) -Add and make use of an accessor function two-way => one-way => one-way => two-way signal cycling
celestar
parents:
3521
diff
changeset
|
183 |
|
3238
9ebec0a611ee
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
tron
parents:
3237
diff
changeset
|
184 |
|
3237
2cf19f9603b2
(svn r3911) Add functions to retrieve/set the signal variant (electric/semaphore)
tron
parents:
3185
diff
changeset
|
185 |
typedef enum SignalVariant { |
2cf19f9603b2
(svn r3911) Add functions to retrieve/set the signal variant (electric/semaphore)
tron
parents:
3185
diff
changeset
|
186 |
SIG_ELECTRIC = 0, |
2cf19f9603b2
(svn r3911) Add functions to retrieve/set the signal variant (electric/semaphore)
tron
parents:
3185
diff
changeset
|
187 |
SIG_SEMAPHORE = 1 |
2cf19f9603b2
(svn r3911) Add functions to retrieve/set the signal variant (electric/semaphore)
tron
parents:
3185
diff
changeset
|
188 |
} SignalVariant; |
2cf19f9603b2
(svn r3911) Add functions to retrieve/set the signal variant (electric/semaphore)
tron
parents:
3185
diff
changeset
|
189 |
|
2cf19f9603b2
(svn r3911) Add functions to retrieve/set the signal variant (electric/semaphore)
tron
parents:
3185
diff
changeset
|
190 |
static inline SignalVariant GetSignalVariant(TileIndex t) |
2cf19f9603b2
(svn r3911) Add functions to retrieve/set the signal variant (electric/semaphore)
tron
parents:
3185
diff
changeset
|
191 |
{ |
2cf19f9603b2
(svn r3911) Add functions to retrieve/set the signal variant (electric/semaphore)
tron
parents:
3185
diff
changeset
|
192 |
return (SignalVariant)GB(_m[t].m4, 2, 1); |
2cf19f9603b2
(svn r3911) Add functions to retrieve/set the signal variant (electric/semaphore)
tron
parents:
3185
diff
changeset
|
193 |
} |
2cf19f9603b2
(svn r3911) Add functions to retrieve/set the signal variant (electric/semaphore)
tron
parents:
3185
diff
changeset
|
194 |
|
2cf19f9603b2
(svn r3911) Add functions to retrieve/set the signal variant (electric/semaphore)
tron
parents:
3185
diff
changeset
|
195 |
static inline void SetSignalVariant(TileIndex t, SignalVariant v) |
2cf19f9603b2
(svn r3911) Add functions to retrieve/set the signal variant (electric/semaphore)
tron
parents:
3185
diff
changeset
|
196 |
{ |
2cf19f9603b2
(svn r3911) Add functions to retrieve/set the signal variant (electric/semaphore)
tron
parents:
3185
diff
changeset
|
197 |
SB(_m[t].m4, 2, 1, v); |
2cf19f9603b2
(svn r3911) Add functions to retrieve/set the signal variant (electric/semaphore)
tron
parents:
3185
diff
changeset
|
198 |
} |
2cf19f9603b2
(svn r3911) Add functions to retrieve/set the signal variant (electric/semaphore)
tron
parents:
3185
diff
changeset
|
199 |
|
3575
f5b56bd958c0
(svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions
celestar
parents:
3530
diff
changeset
|
200 |
static inline bool IsSignalPresent(TileIndex t, byte signalbit) |
f5b56bd958c0
(svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions
celestar
parents:
3530
diff
changeset
|
201 |
{ |
f5b56bd958c0
(svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions
celestar
parents:
3530
diff
changeset
|
202 |
return HASBIT(_m[t].m3, signalbit + 4); |
f5b56bd958c0
(svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions
celestar
parents:
3530
diff
changeset
|
203 |
} |
f5b56bd958c0
(svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions
celestar
parents:
3530
diff
changeset
|
204 |
|
f5b56bd958c0
(svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions
celestar
parents:
3530
diff
changeset
|
205 |
/** These are states in which a signal can be. Currently these are only two, so |
f5b56bd958c0
(svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions
celestar
parents:
3530
diff
changeset
|
206 |
* simple boolean logic will do. But do try to compare to this enum instead of |
f5b56bd958c0
(svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions
celestar
parents:
3530
diff
changeset
|
207 |
* normal boolean evaluation, since that will make future additions easier. |
f5b56bd958c0
(svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions
celestar
parents:
3530
diff
changeset
|
208 |
*/ |
f5b56bd958c0
(svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions
celestar
parents:
3530
diff
changeset
|
209 |
typedef enum SignalStates { |
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
210 |
SIGNAL_STATE_RED = 0, |
3575
f5b56bd958c0
(svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions
celestar
parents:
3530
diff
changeset
|
211 |
SIGNAL_STATE_GREEN = 1, |
f5b56bd958c0
(svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions
celestar
parents:
3530
diff
changeset
|
212 |
} SignalState; |
f5b56bd958c0
(svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions
celestar
parents:
3530
diff
changeset
|
213 |
|
f5b56bd958c0
(svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions
celestar
parents:
3530
diff
changeset
|
214 |
static inline SignalState GetSingleSignalState(TileIndex t, byte signalbit) |
f5b56bd958c0
(svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions
celestar
parents:
3530
diff
changeset
|
215 |
{ |
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3792
diff
changeset
|
216 |
return (SignalState)HASBIT(_m[t].m2, signalbit + 4); |
3575
f5b56bd958c0
(svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions
celestar
parents:
3530
diff
changeset
|
217 |
} |
f5b56bd958c0
(svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions
celestar
parents:
3530
diff
changeset
|
218 |
|
3237
2cf19f9603b2
(svn r3911) Add functions to retrieve/set the signal variant (electric/semaphore)
tron
parents:
3185
diff
changeset
|
219 |
|
4041
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
220 |
/** |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
221 |
* Checks for the presence of signals (either way) on the given track on the |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
222 |
* given rail tile. |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
223 |
*/ |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
224 |
static inline bool HasSignalOnTrack(TileIndex tile, Track track) |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
225 |
{ |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
226 |
assert(IsValidTrack(track)); |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
227 |
return |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
228 |
GetRailTileType(tile) == RAIL_TILE_SIGNALS && |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
229 |
(_m[tile].m3 & SignalOnTrack(track)) != 0; |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
230 |
} |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
231 |
|
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
232 |
/** |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
233 |
* Checks for the presence of signals along the given trackdir on the given |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
234 |
* rail tile. |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
235 |
* |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
236 |
* Along meaning if you are currently driving on the given trackdir, this is |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
237 |
* the signal that is facing us (for which we stop when it's red). |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
238 |
*/ |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
239 |
static inline bool HasSignalOnTrackdir(TileIndex tile, Trackdir trackdir) |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
240 |
{ |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
241 |
assert (IsValidTrackdir(trackdir)); |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
242 |
return |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
243 |
GetRailTileType(tile) == RAIL_TILE_SIGNALS && |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
244 |
_m[tile].m3 & SignalAlongTrackdir(trackdir); |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
245 |
} |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
246 |
|
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
247 |
/** |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
248 |
* Gets the state of the signal along the given trackdir. |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
249 |
* |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
250 |
* Along meaning if you are currently driving on the given trackdir, this is |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
251 |
* the signal that is facing us (for which we stop when it's red). |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
252 |
*/ |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
253 |
static inline SignalState GetSignalStateByTrackdir(TileIndex tile, Trackdir trackdir) |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
254 |
{ |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
255 |
assert(IsValidTrackdir(trackdir)); |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
256 |
assert(HasSignalOnTrack(tile, TrackdirToTrack(trackdir))); |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
257 |
return _m[tile].m2 & SignalAlongTrackdir(trackdir) ? |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
258 |
SIGNAL_STATE_GREEN : SIGNAL_STATE_RED; |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
259 |
} |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
260 |
|
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
261 |
|
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
262 |
/** |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
263 |
* Return the rail type of tile, or INVALID_RAILTYPE if this is no rail tile. |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
264 |
* Note that there is no check if the given trackdir is actually present on |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
265 |
* the tile! |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
266 |
* The given trackdir is used when there are (could be) multiple rail types on |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
267 |
* one tile. |
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
268 |
*/ |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5475
diff
changeset
|
269 |
RailType GetTileRailType(TileIndex tile, Track track); |
4041
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
270 |
|
72276cd8ee2b
(svn r5309) Partially fix the rail header dependency fiasco: rail_map.h now depends on rail.h and not the other way round anymore
tron
parents:
3977
diff
changeset
|
271 |
|
3523
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
272 |
typedef enum RailGroundType { |
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
273 |
RAIL_GROUND_BARREN = 0, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
274 |
RAIL_GROUND_GRASS = 1, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
275 |
RAIL_GROUND_FENCE_NW = 2, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
276 |
RAIL_GROUND_FENCE_SE = 3, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
277 |
RAIL_GROUND_FENCE_SENW = 4, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
278 |
RAIL_GROUND_FENCE_NE = 5, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
279 |
RAIL_GROUND_FENCE_SW = 6, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
280 |
RAIL_GROUND_FENCE_NESW = 7, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
281 |
RAIL_GROUND_FENCE_VERT1 = 8, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
282 |
RAIL_GROUND_FENCE_VERT2 = 9, |
3523
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
283 |
RAIL_GROUND_FENCE_HORIZ1 = 10, |
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
284 |
RAIL_GROUND_FENCE_HORIZ2 = 11, |
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
285 |
RAIL_GROUND_ICE_DESERT = 12, |
3523
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
286 |
} RailGroundType; |
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
287 |
|
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
288 |
static inline void SetRailGroundType(TileIndex t, RailGroundType rgt) |
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
289 |
{ |
3792
67c865c9315c
(svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity
rubidium
parents:
3772
diff
changeset
|
290 |
if (GetRailTileType(t) == RAIL_TILE_DEPOT_WAYPOINT) { |
3523
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
291 |
SB(_m[t].m4, 0, 4, rgt); |
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
292 |
return; |
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
293 |
} |
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
294 |
SB(_m[t].m2, 0, 4, rgt); |
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
295 |
} |
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
296 |
|
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
297 |
static inline RailGroundType GetRailGroundType(TileIndex t) |
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
298 |
{ |
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
299 |
/* TODO Unify this */ |
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3792
diff
changeset
|
300 |
if (GetRailTileType(t) == RAIL_TILE_DEPOT_WAYPOINT) return (RailGroundType)GB(_m[t].m4, 0, 4); |
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3792
diff
changeset
|
301 |
return (RailGroundType)GB(_m[t].m2, 0, 4); |
3523
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
302 |
} |
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
303 |
|
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
304 |
static inline bool IsSnowRailGround(TileIndex t) |
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
305 |
{ |
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
306 |
return GetRailGroundType(t) == RAIL_GROUND_ICE_DESERT; |
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
307 |
} |
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
308 |
|
549603ffba5d
(svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types
celestar
parents:
3522
diff
changeset
|
309 |
|
3101
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
310 |
static inline void MakeRailNormal(TileIndex t, Owner o, TrackBits b, RailType r) |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
311 |
{ |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
312 |
SetTileType(t, MP_RAILWAY); |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
313 |
SetTileOwner(t, o); |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
314 |
_m[t].m2 = 0; |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
315 |
_m[t].m3 = r; |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
316 |
_m[t].m4 = 0; |
3792
67c865c9315c
(svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity
rubidium
parents:
3772
diff
changeset
|
317 |
_m[t].m5 = RAIL_TILE_NORMAL | b; |
3101
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
318 |
} |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
319 |
|
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
320 |
|
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
321 |
static inline void MakeRailDepot(TileIndex t, Owner o, DiagDirection d, RailType r) |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
322 |
{ |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
323 |
SetTileType(t, MP_RAILWAY); |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
324 |
SetTileOwner(t, o); |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
325 |
_m[t].m2 = 0; |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
326 |
_m[t].m3 = r; |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
327 |
_m[t].m4 = 0; |
3792
67c865c9315c
(svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity
rubidium
parents:
3772
diff
changeset
|
328 |
_m[t].m5 = RAIL_TILE_DEPOT_WAYPOINT | RAIL_SUBTYPE_DEPOT | d; |
3101
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
329 |
} |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
330 |
|
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
331 |
|
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
332 |
static inline void MakeRailWaypoint(TileIndex t, Owner o, Axis a, RailType r, uint index) |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
333 |
{ |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
334 |
SetTileType(t, MP_RAILWAY); |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
335 |
SetTileOwner(t, o); |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
336 |
_m[t].m2 = index; |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
337 |
_m[t].m3 = r; |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
338 |
_m[t].m4 = 0; |
3792
67c865c9315c
(svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity
rubidium
parents:
3772
diff
changeset
|
339 |
_m[t].m5 = RAIL_TILE_DEPOT_WAYPOINT | RAIL_SUBTYPE_WAYPOINT | a; |
3101
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
340 |
} |
a44fdf9faef1
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
tron
parents:
diff
changeset
|
341 |
|
4666
172a0cdf28a6
(svn r6560) - Codechange: Minor fix; add missing #include guards and comments, and correct svn properties on bmp.[ch]
peter1138
parents:
4474
diff
changeset
|
342 |
#endif /* RAIL_MAP_H */ |