| author | tron |
| Mon, 28 Mar 2005 18:59:33 +0000 | |
| changeset 1598 | 4425f756c19b |
| parent 1591 | bf840aede1b1 |
| child 1609 | b4d11170cbb5 |
| permissions | -rw-r--r-- |
| 0 | 1 |
#include "stdafx.h" |
2 |
#include "ttd.h" |
|
|
1363
01d3de5d8039
(svn r1867) Include tables/sprites.h only in files which need it
tron
parents:
1330
diff
changeset
|
3 |
#include "table/sprites.h" |
|
507
8aa8100b0b22
(svn r815) Include strings.h only in the files which need it.
tron
parents:
497
diff
changeset
|
4 |
#include "table/strings.h" |
|
1009
a7ccb8e39cbc
(svn r1508) Remove duplicate declarations and include proper headers where necessary
tron
parents:
926
diff
changeset
|
5 |
#include "gfx.h" |
|
679
e959706a3e4d
(svn r1117) Move map arrays and some related macros into their own files map.c and map.h
tron
parents:
555
diff
changeset
|
6 |
#include "map.h" |
|
1209
a1ac96655b79
(svn r1713) Split off several functions which query/set information about a single tile from map.h and put them into a seperate file tile.h
tron
parents:
1123
diff
changeset
|
7 |
#include "tile.h" |
| 0 | 8 |
#include "vehicle.h" |
9 |
#include "viewport.h" |
|
10 |
#include "command.h" |
|
11 |
#include "pathfind.h" |
|
12 |
#include "town.h" |
|
|
337
66647f97e7c0
(svn r513) Merge revisions 402, 416, 417, 478, 479, 511, 512 from map to trunk
tron
parents:
283
diff
changeset
|
13 |
#include "sound.h" |
|
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
14 |
#include "station.h" |
|
405
6830ae7a0d5d
(svn r602) -newgrf: Move DrawTileSeqStruct & co and struct SpriteGroup to sprite.h (pasky)
darkvater
parents:
403
diff
changeset
|
15 |
#include "sprite.h" |
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1247
diff
changeset
|
16 |
#include "depot.h" |
|
1542
2ca6d1624e6d
(svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h
truelight
parents:
1536
diff
changeset
|
17 |
#include "waypoint.h" |
| 0 | 18 |
|
|
415
423de36034b8
(svn r612) [newgrf] Fix: custom waypoints on monorail/maglev are displayed correctly
dominik
parents:
413
diff
changeset
|
19 |
extern uint16 _custom_sprites_base; |
|
423de36034b8
(svn r612) [newgrf] Fix: custom waypoints on monorail/maglev are displayed correctly
dominik
parents:
413
diff
changeset
|
20 |
|
| 0 | 21 |
void ShowTrainDepotWindow(uint tile); |
22 |
||
| 22 | 23 |
enum { /* These values are bitmasks for the map5 byte */
|
| 0 | 24 |
RAIL_TYPE_NORMAL = 0, |
25 |
RAIL_TYPE_SIGNALS = 0x40, |
|
26 |
RAIL_TYPE_SPECIAL = 0x80, // If this bit is set, then it's not a regular track. |
|
27 |
RAIL_TYPE_DEPOT = 0xC0, |
|
28 |
RAIL_TYPE_MASK = 0xC0, |
|
29 |
||
30 |
RAIL_BIT_DIAG1 = 1, // 0 |
|
31 |
RAIL_BIT_DIAG2 = 2, // 1 |
|
32 |
RAIL_BIT_UPPER = 4, // 2 |
|
33 |
RAIL_BIT_LOWER = 8, // 3 |
|
34 |
RAIL_BIT_LEFT = 16, // 4 |
|
35 |
RAIL_BIT_RIGHT = 32, // 5 |
|
36 |
RAIL_BIT_MASK = 0x3F, |
|
37 |
||
38 |
RAIL_DEPOT_TRACK_MASK = 1, |
|
39 |
RAIL_DEPOT_DIR = 3, |
|
40 |
||
|
1534
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
41 |
RAIL_SUBTYPE_MASK = 0x3C, |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
42 |
RAIL_SUBTYPE_DEPOT = 0x00, |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
43 |
RAIL_SUBTYPE_WAYPOINT = 0x04 |
| 0 | 44 |
}; |
45 |
||
|
1535
a5f686a20d2c
(svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint
tron
parents:
1534
diff
changeset
|
46 |
static inline bool IsRailDepot(byte m5) |
|
a5f686a20d2c
(svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint
tron
parents:
1534
diff
changeset
|
47 |
{
|
|
a5f686a20d2c
(svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint
tron
parents:
1534
diff
changeset
|
48 |
return |
|
a5f686a20d2c
(svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint
tron
parents:
1534
diff
changeset
|
49 |
(m5 & RAIL_TYPE_MASK) == RAIL_TYPE_DEPOT && |
|
a5f686a20d2c
(svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint
tron
parents:
1534
diff
changeset
|
50 |
(m5 & RAIL_SUBTYPE_MASK) == RAIL_SUBTYPE_DEPOT; |
|
a5f686a20d2c
(svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint
tron
parents:
1534
diff
changeset
|
51 |
} |
|
a5f686a20d2c
(svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint
tron
parents:
1534
diff
changeset
|
52 |
|
| 0 | 53 |
/* Format of rail map5 byte. |
54 |
* 00 abcdef => Normal rail |
|
55 |
* 01 abcdef => Rail with signals |
|
56 |
* 10 ?????? => Unused |
|
57 |
* 11 ????dd => Depot |
|
| 22 | 58 |
* |
59 |
* abcdef is a bitmask, which contains ones for all present tracks. Below the |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
60 |
* value for each track is given. |
| 0 | 61 |
*/ |
62 |
||
63 |
/* 4 |
|
64 |
* --------- |
|
65 |
* |\ /| |
|
66 |
* | \ 1/ | |
|
67 |
* | \ / | |
|
68 |
* | \ / | |
|
69 |
* 16| \ |32 |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
70 |
* | / \2 | |
| 0 | 71 |
* | / \ | |
72 |
* | / \ | |
|
73 |
* |/ \| |
|
74 |
* --------- |
|
75 |
* 8 |
|
76 |
*/ |
|
77 |
||
78 |
||
79 |
// Constants for lower part of Map2 byte. |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
80 |
enum RailMap2Lower4 {
|
| 0 | 81 |
RAIL_MAP2LO_GROUND_MASK = 0xF, |
82 |
RAIL_GROUND_BROWN = 0, |
|
83 |
RAIL_GROUND_GREEN = 1, |
|
84 |
RAIL_GROUND_FENCE_NW = 2, |
|
85 |
RAIL_GROUND_FENCE_SE = 3, |
|
86 |
RAIL_GROUND_FENCE_SENW = 4, |
|
87 |
RAIL_GROUND_FENCE_NE = 5, |
|
88 |
RAIL_GROUND_FENCE_SW = 6, |
|
89 |
RAIL_GROUND_FENCE_NESW = 7, |
|
90 |
RAIL_GROUND_FENCE_VERT1 = 8, |
|
91 |
RAIL_GROUND_FENCE_VERT2 = 9, |
|
92 |
RAIL_GROUND_FENCE_HORIZ1 = 10, |
|
93 |
RAIL_GROUND_FENCE_HORIZ2 = 11, |
|
94 |
RAIL_GROUND_ICE_DESERT = 12, |
|
95 |
}; |
|
96 |
||
97 |
||
| 22 | 98 |
/* MAP2 byte: abcd???? => Signal On? Same coding as map3lo |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
99 |
* MAP3LO byte: abcd???? => Signal Exists? |
| 22 | 100 |
* a and b are for diagonals, upper and left, |
101 |
* one for each direction. (ie a == NE->SW, b == |
|
102 |
* SW->NE, or v.v., I don't know. b and c are |
|
103 |
* similar for lower and right. |
|
| 0 | 104 |
* MAP2 byte: ????abcd => Type of ground. |
105 |
* MAP3LO byte: ????abcd => Type of rail. |
|
106 |
* MAP5: 00abcdef => rail |
|
107 |
* 01abcdef => rail w/ signals |
|
108 |
* 10uuuuuu => unused |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
109 |
* 11uuuudd => rail depot |
| 0 | 110 |
*/ |
111 |
||
112 |
static bool CheckTrackCombination(byte map5, byte trackbits, byte flags) |
|
113 |
{
|
|
114 |
_error_message = STR_1001_IMPOSSIBLE_TRACK_COMBINATION; |
|
115 |
||
|
1591
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
116 |
switch (map5 & RAIL_TYPE_MASK) {
|
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
117 |
case RAIL_TYPE_NORMAL: |
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
118 |
if (map5 & trackbits) {
|
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
119 |
_error_message = STR_1007_ALREADY_BUILT; |
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
120 |
return false; |
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
121 |
} |
| 0 | 122 |
|
|
1591
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
123 |
if (flags & DC_NO_RAIL_OVERLAP) {
|
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
124 |
// Computer players are not allowed to intersect pieces of rail. |
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
125 |
map5 |= trackbits; |
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
126 |
return |
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
127 |
map5 == (RAIL_BIT_UPPER | RAIL_BIT_LOWER) || |
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
128 |
map5 == (RAIL_BIT_LEFT | RAIL_BIT_RIGHT); |
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
129 |
} else {
|
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
130 |
return true; |
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
131 |
} |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
132 |
|
|
1591
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
133 |
case RAIL_TYPE_SIGNALS: |
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
134 |
if (map5 & trackbits) {
|
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
135 |
_error_message = STR_1007_ALREADY_BUILT; |
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
136 |
return false; |
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
137 |
} |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
138 |
|
|
1591
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
139 |
map5 |= trackbits; |
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
140 |
return |
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
141 |
map5 == (RAIL_TYPE_SIGNALS | RAIL_BIT_UPPER | RAIL_BIT_LOWER) || |
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
142 |
map5 == (RAIL_TYPE_SIGNALS | RAIL_BIT_LEFT | RAIL_BIT_RIGHT); |
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
143 |
|
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
144 |
default: |
|
bf840aede1b1
(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability
tron
parents:
1590
diff
changeset
|
145 |
return false; |
| 0 | 146 |
} |
147 |
} |
|
148 |
||
149 |
||
|
13
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
150 |
static const byte _valid_tileh_slopes[4][15] = {
|
| 0 | 151 |
|
152 |
// set of normal ones |
|
153 |
{
|
|
154 |
RAIL_BIT_DIAG1|RAIL_BIT_DIAG2|RAIL_BIT_UPPER|RAIL_BIT_LOWER|RAIL_BIT_LEFT|RAIL_BIT_RIGHT, |
|
155 |
RAIL_BIT_RIGHT, |
|
156 |
RAIL_BIT_UPPER, |
|
157 |
RAIL_BIT_DIAG1, |
|
158 |
||
159 |
RAIL_BIT_LEFT, |
|
160 |
0, |
|
161 |
RAIL_BIT_DIAG2, |
|
162 |
RAIL_BIT_LOWER, |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
163 |
|
| 0 | 164 |
RAIL_BIT_LOWER, |
165 |
RAIL_BIT_DIAG2, |
|
166 |
0, |
|
167 |
RAIL_BIT_LEFT, |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
168 |
|
| 0 | 169 |
RAIL_BIT_DIAG1, |
170 |
RAIL_BIT_UPPER, |
|
171 |
RAIL_BIT_RIGHT, |
|
172 |
}, |
|
173 |
||
174 |
// allowed rail for an evenly raised platform |
|
175 |
{
|
|
176 |
0, |
|
177 |
RAIL_BIT_LEFT, |
|
178 |
RAIL_BIT_LOWER, |
|
179 |
RAIL_BIT_DIAG2 | RAIL_BIT_LOWER | RAIL_BIT_LEFT, |
|
180 |
||
181 |
RAIL_BIT_RIGHT, |
|
182 |
RAIL_BIT_DIAG1|RAIL_BIT_DIAG2|RAIL_BIT_UPPER|RAIL_BIT_LOWER|RAIL_BIT_LEFT|RAIL_BIT_RIGHT, |
|
183 |
RAIL_BIT_DIAG1 | RAIL_BIT_LOWER | RAIL_BIT_RIGHT, |
|
184 |
RAIL_BIT_DIAG1|RAIL_BIT_DIAG2|RAIL_BIT_UPPER|RAIL_BIT_LOWER|RAIL_BIT_LEFT|RAIL_BIT_RIGHT, |
|
185 |
||
186 |
RAIL_BIT_UPPER, |
|
187 |
RAIL_BIT_DIAG1 | RAIL_BIT_UPPER | RAIL_BIT_LEFT, |
|
188 |
RAIL_BIT_DIAG1|RAIL_BIT_DIAG2|RAIL_BIT_UPPER|RAIL_BIT_LOWER|RAIL_BIT_LEFT|RAIL_BIT_RIGHT, |
|
189 |
RAIL_BIT_DIAG1|RAIL_BIT_DIAG2|RAIL_BIT_UPPER|RAIL_BIT_LOWER|RAIL_BIT_LEFT|RAIL_BIT_RIGHT, |
|
190 |
||
191 |
RAIL_BIT_DIAG2 | RAIL_BIT_UPPER | RAIL_BIT_RIGHT, |
|
192 |
RAIL_BIT_DIAG1|RAIL_BIT_DIAG2|RAIL_BIT_UPPER|RAIL_BIT_LOWER|RAIL_BIT_LEFT|RAIL_BIT_RIGHT, |
|
193 |
RAIL_BIT_DIAG1|RAIL_BIT_DIAG2|RAIL_BIT_UPPER|RAIL_BIT_LOWER|RAIL_BIT_LEFT|RAIL_BIT_RIGHT, |
|
194 |
}, |
|
195 |
||
196 |
// allowed rail on coast tile |
|
197 |
{
|
|
198 |
0, |
|
199 |
RAIL_BIT_LEFT, |
|
200 |
RAIL_BIT_LOWER, |
|
201 |
RAIL_BIT_DIAG2|RAIL_BIT_LEFT|RAIL_BIT_LOWER, |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
202 |
|
| 0 | 203 |
RAIL_BIT_RIGHT, |
204 |
RAIL_BIT_DIAG1|RAIL_BIT_DIAG2|RAIL_BIT_UPPER|RAIL_BIT_LOWER|RAIL_BIT_LEFT|RAIL_BIT_RIGHT, |
|
205 |
RAIL_BIT_DIAG1|RAIL_BIT_RIGHT|RAIL_BIT_LOWER, |
|
206 |
RAIL_BIT_DIAG1|RAIL_BIT_DIAG2|RAIL_BIT_UPPER|RAIL_BIT_LOWER|RAIL_BIT_LEFT|RAIL_BIT_RIGHT, |
|
207 |
||
208 |
RAIL_BIT_UPPER, |
|
209 |
RAIL_BIT_DIAG1|RAIL_BIT_LEFT|RAIL_BIT_UPPER, |
|
210 |
RAIL_BIT_DIAG1|RAIL_BIT_DIAG2|RAIL_BIT_UPPER|RAIL_BIT_LOWER|RAIL_BIT_LEFT|RAIL_BIT_RIGHT, |
|
211 |
RAIL_BIT_DIAG1|RAIL_BIT_DIAG2|RAIL_BIT_UPPER|RAIL_BIT_LOWER|RAIL_BIT_LEFT|RAIL_BIT_RIGHT, |
|
212 |
||
213 |
RAIL_BIT_DIAG2|RAIL_BIT_RIGHT|RAIL_BIT_UPPER, |
|
214 |
RAIL_BIT_DIAG1|RAIL_BIT_DIAG2|RAIL_BIT_UPPER|RAIL_BIT_LOWER|RAIL_BIT_LEFT|RAIL_BIT_RIGHT, |
|
215 |
RAIL_BIT_DIAG1|RAIL_BIT_DIAG2|RAIL_BIT_UPPER|RAIL_BIT_LOWER|RAIL_BIT_LEFT|RAIL_BIT_RIGHT, |
|
|
13
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
216 |
}, |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
217 |
|
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
218 |
// valid railway crossings on slopes |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
219 |
{
|
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
220 |
1, 0, 0, // 0, 1, 2 |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
221 |
0, 0, 1, // 3, 4, 5 |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
222 |
0, 1, 0, // 6, 7, 8 |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
223 |
0, 1, 1, // 9, 10, 11 |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
224 |
0, 1, 1, // 12, 13, 14 |
| 0 | 225 |
} |
226 |
}; |
|
227 |
||
|
84
1e0721c29bad
(svn r85) -Add: initial commit of new AI (enable in Patch menu)
truelight
parents:
59
diff
changeset
|
228 |
uint GetRailFoundation(uint tileh, uint bits) |
| 0 | 229 |
{
|
230 |
int i; |
|
231 |
||
232 |
if ((~_valid_tileh_slopes[0][tileh] & bits) == 0) |
|
233 |
return 0; |
|
234 |
||
235 |
if ((~_valid_tileh_slopes[1][tileh] & bits) == 0) |
|
236 |
return tileh; |
|
237 |
||
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
238 |
if ( ((i=0, tileh == 1) || (i+=2, tileh == 2) || (i+=2, tileh == 4) || (i+=2, tileh == 8)) && (bits == RAIL_BIT_DIAG1 || (i++, bits == RAIL_BIT_DIAG2))) |
| 0 | 239 |
return i + 15; |
240 |
||
241 |
return 0; |
|
242 |
} |
|
243 |
||
244 |
// |
|
245 |
static uint32 CheckRailSlope(int tileh, uint rail_bits, uint existing, uint tile) |
|
246 |
{
|
|
247 |
// never allow building on top of steep tiles |
|
248 |
if (!(tileh & 0x10)) {
|
|
249 |
rail_bits |= existing; |
|
250 |
||
251 |
// don't allow building on the lower side of a coast |
|
|
1035
0a170deb6e33
(svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts
tron
parents:
1024
diff
changeset
|
252 |
if (IsTileType(tile, MP_WATER) && ~_valid_tileh_slopes[2][tileh] & rail_bits) {
|
| 0 | 253 |
return_cmd_error(STR_3807_CAN_T_BUILD_ON_WATER); |
254 |
} |
|
255 |
||
256 |
// no special foundation |
|
257 |
if ((~_valid_tileh_slopes[0][tileh] & rail_bits) == 0) |
|
258 |
return 0; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
259 |
|
| 0 | 260 |
if (((~_valid_tileh_slopes[1][tileh] & rail_bits) == 0) || // whole tile is leveled up |
261 |
((rail_bits == RAIL_BIT_DIAG1 || rail_bits == RAIL_BIT_DIAG2) && (tileh == 1 || tileh == 2 || tileh == 4 || tileh == 8))) { // partly up
|
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
262 |
return existing ? 0 : _price.terraform; |
| 0 | 263 |
} |
264 |
} |
|
265 |
return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION); |
|
266 |
} |
|
267 |
||
268 |
/* Build a single track. |
|
269 |
* p1 - railroad type normal/maglev |
|
270 |
* p2 - tile direction |
|
271 |
*/ |
|
272 |
||
273 |
int32 CmdBuildSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
|
274 |
{
|
|
275 |
TileInfo ti; |
|
276 |
int32 ret, cost = 0; |
|
277 |
byte rail_bit = 1 << p2; |
|
278 |
byte rail_type = (byte)(p1 & 0xF); |
|
279 |
uint tile; |
|
280 |
byte existing = 0; |
|
281 |
bool need_clear = false; |
|
282 |
||
283 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
|
284 |
||
285 |
_error_message = STR_1007_ALREADY_BUILT; |
|
286 |
||
287 |
FindLandscapeHeight(&ti, x, y); |
|
288 |
tile = ti.tile; |
|
289 |
||
290 |
// allow building rail under bridge |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
291 |
if (ti.type != MP_TUNNELBRIDGE && !EnsureNoVehicle(tile)) |
| 0 | 292 |
return CMD_ERROR; |
293 |
||
294 |
if (ti.type == MP_TUNNELBRIDGE) {
|
|
295 |
/* BUILD ON BRIDGE CODE */ |
|
|
1041
be151b7bc909
(svn r1542) Rename TileHeight to TilePixelHeight, because this is what it actually returns
tron
parents:
1035
diff
changeset
|
296 |
if (!EnsureNoVehicleZ(tile, TilePixelHeight(tile))) |
| 0 | 297 |
return CMD_ERROR; |
298 |
||
299 |
if ((ti.map5 & 0xF8) == 0xC0) {
|
|
300 |
if (ti.tileh & 0x10 || rail_bit != (byte)((ti.map5 & 1) ? 1 : 2)) goto need_clear; |
|
301 |
||
302 |
if (!(flags & DC_EXEC)) |
|
303 |
return _price.build_rail; |
|
304 |
||
305 |
_map5[tile] = (ti.map5 & 0xC7) | 0x20; |
|
306 |
goto set_ownership; |
|
307 |
} else if ((ti.map5 & 0xF8) == 0xE0) {
|
|
308 |
if ((_map3_lo[tile] & 0xF) != (int)p1) goto need_clear; |
|
309 |
if (rail_bit != (byte)((ti.map5 & 1) ? 1 : 2)) goto need_clear; |
|
310 |
return CMD_ERROR; |
|
311 |
} else |
|
312 |
goto need_clear; |
|
313 |
} else if (ti.type == MP_STREET) {
|
|
314 |
byte m5; |
|
315 |
/* BUILD ON STREET CODE */ |
|
|
13
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
316 |
if (ti.tileh & 0x10) // very steep tile |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
317 |
return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION); |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
318 |
|
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
319 |
if (!_valid_tileh_slopes[3][ti.tileh]) // prevent certain slopes |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
320 |
return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION); |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
321 |
|
| 0 | 322 |
if (!(ti.map5 & 0xF0)) {
|
323 |
if ((ti.map5 & 0x0F) == 0xA) {
|
|
324 |
if (rail_bit != 2) goto need_clear; |
|
325 |
m5 = 0x10; |
|
326 |
} else if ((ti.map5 & 0x0F) == 0x5) {
|
|
327 |
if (rail_bit != 1) goto need_clear; |
|
328 |
m5 = 0x18; |
|
329 |
} else |
|
330 |
goto need_clear; |
|
331 |
||
332 |
if (!(flags & DC_EXEC)) |
|
333 |
return _price.build_rail; |
|
334 |
||
335 |
ModifyTile(tile, |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
336 |
MP_SETTYPE(MP_STREET) | |
| 0 | 337 |
MP_MAP3LO | MP_MAP3HI | MP_MAPOWNER_CURRENT | MP_MAP5, |
338 |
_map_owner[tile], /* map3_lo */ |
|
339 |
p1, /* map3_hi */ |
|
340 |
m5 /* map5 */ |
|
341 |
); |
|
342 |
goto fix_signals; |
|
343 |
} else if (!(ti.map5 & 0xE0)) {
|
|
344 |
if (rail_bit != (byte)((ti.map5 & 8) ? 1 : 2)) goto need_clear; |
|
345 |
return CMD_ERROR; |
|
346 |
} else |
|
347 |
goto need_clear; |
|
348 |
} else if (ti.type == MP_RAILWAY) {
|
|
349 |
||
350 |
/* BUILD ON RAILWAY CODE */ |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
351 |
if (_map_owner[tile] != _current_player || (byte)(_map3_lo[tile]&0xF) != rail_type) |
| 0 | 352 |
goto need_clear; |
353 |
if (!CheckTrackCombination(ti.map5, rail_bit, (byte)flags)) |
|
354 |
return CMD_ERROR; |
|
355 |
||
356 |
existing = ti.map5 & 0x3F; |
|
357 |
} else {
|
|
358 |
||
359 |
/* DEFAULT BUILD ON CODE */ |
|
360 |
need_clear:; |
|
361 |
/* isnot_railway */ |
|
362 |
if (!(flags & DC_EXEC)) {
|
|
363 |
ret = DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); |
|
364 |
if (ret == CMD_ERROR) return CMD_ERROR; |
|
365 |
cost += ret; |
|
366 |
} |
|
367 |
need_clear = true; |
|
368 |
} |
|
369 |
||
370 |
ret = CheckRailSlope(ti.tileh, rail_bit, existing, tile); |
|
371 |
if (ret & 0x80000000) |
|
372 |
return ret; |
|
373 |
cost += ret; |
|
374 |
||
375 |
// the AI is not allowed to used foundationed tiles. |
|
|
84
1e0721c29bad
(svn r85) -Add: initial commit of new AI (enable in Patch menu)
truelight
parents:
59
diff
changeset
|
376 |
if (ret && (!_patches.build_on_slopes || (!_patches.ainew_active && _is_ai_player))) |
| 0 | 377 |
return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION); |
378 |
||
379 |
if (flags & DC_EXEC && need_clear) {
|
|
380 |
ret = DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); |
|
381 |
if (ret == CMD_ERROR) return CMD_ERROR; |
|
382 |
cost += ret; |
|
383 |
} |
|
384 |
||
385 |
if (flags & DC_EXEC) {
|
|
|
1059
c28c6be74291
(svn r1560) Introduce SetTileType() and SetTileHeight()
tron
parents:
1041
diff
changeset
|
386 |
SetTileType(tile, MP_RAILWAY); |
| 0 | 387 |
_map5[tile] |= rail_bit; |
388 |
_map2[tile] &= ~RAIL_MAP2LO_GROUND_MASK; |
|
389 |
||
390 |
// In case it's a tile without signals, clear the signal bits. Why? |
|
391 |
if ((_map5[tile] & RAIL_TYPE_MASK) != RAIL_TYPE_SIGNALS) |
|
392 |
_map2[tile] &= ~0xF0; |
|
393 |
||
394 |
set_ownership: |
|
395 |
_map_owner[tile] = _current_player; |
|
396 |
||
397 |
_map3_lo[tile] &= ~0xF; |
|
398 |
_map3_lo[tile] |= rail_type; |
|
399 |
||
400 |
MarkTileDirtyByTile(tile); |
|
401 |
||
402 |
fix_signals: |
|
403 |
SetSignalsOnBothDir(tile, (byte)p2); |
|
404 |
} |
|
405 |
||
406 |
return cost + _price.build_rail; |
|
407 |
} |
|
408 |
||
409 |
static const byte _signals_table[] = {
|
|
410 |
0x40, 0x40, 0x40, 0x10, 0x80, 0x20, 0, 0, // direction 1 |
|
411 |
0x80, 0x80, 0x80, 0x20, 0x40, 0x10, 0, 0 // direction 2 |
|
412 |
}; |
|
413 |
||
414 |
static const byte _signals_table_other[] = {
|
|
415 |
0x80, 0x80, 0x80, 0x20, 0x40, 0x10, 0, 0, // direction 1 |
|
416 |
0x40, 0x40, 0x40, 0x10, 0x80, 0x20, 0, 0 // direction 2 |
|
417 |
}; |
|
418 |
||
419 |
static const byte _signals_table_both[] = {
|
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
420 |
0xC0, 0xC0, 0xC0, 0x30, 0xC0, 0x30, 0, 0, // both directions combined |
| 0 | 421 |
0xC0, 0xC0, 0xC0, 0x30, 0xC0, 0x30, 0, 0 |
422 |
}; |
|
423 |
||
424 |
||
425 |
/* Remove a single track. |
|
426 |
* p1 - unused |
|
427 |
* p2 - tile direction |
|
428 |
*/ |
|
429 |
||
430 |
int32 CmdRemoveSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
|
431 |
{
|
|
432 |
TileInfo ti; |
|
433 |
byte rail_bit = 1 << p2; |
|
434 |
byte m5; |
|
435 |
uint tile; |
|
436 |
||
437 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
|
438 |
||
439 |
FindLandscapeHeight(&ti, x, y); |
|
440 |
||
441 |
tile = ti.tile; |
|
442 |
||
443 |
if (!((1<<ti.type) & ((1<<MP_TUNNELBRIDGE)|(1<<MP_STREET)|(1<<MP_RAILWAY)))) |
|
444 |
return CMD_ERROR; |
|
445 |
||
446 |
if (_current_player != OWNER_WATER && !CheckTileOwnership(tile)) |
|
447 |
return CMD_ERROR; |
|
448 |
||
449 |
// allow building rail under bridge |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
450 |
if (ti.type != MP_TUNNELBRIDGE && !EnsureNoVehicle(tile)) |
| 0 | 451 |
return CMD_ERROR; |
452 |
||
453 |
if (ti.type == MP_TUNNELBRIDGE) {
|
|
|
1041
be151b7bc909
(svn r1542) Rename TileHeight to TilePixelHeight, because this is what it actually returns
tron
parents:
1035
diff
changeset
|
454 |
if (!EnsureNoVehicleZ(tile, TilePixelHeight(tile))) |
| 0 | 455 |
return CMD_ERROR; |
456 |
||
457 |
if ((ti.map5 & 0xF8) != 0xE0) |
|
458 |
return CMD_ERROR; |
|
459 |
||
460 |
if ( ((ti.map5 & 1) ? 1 : 2) != rail_bit ) |
|
461 |
return CMD_ERROR; |
|
462 |
||
463 |
if (!(flags & DC_EXEC)) |
|
464 |
return _price.remove_rail; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
465 |
|
| 0 | 466 |
_map_owner[tile] = OWNER_NONE; |
467 |
_map5[tile] = ti.map5 & 0xC7; |
|
468 |
} else if (ti.type == MP_STREET) {
|
|
469 |
if (!(ti.map5 & 0xF0)) |
|
470 |
return CMD_ERROR; |
|
471 |
||
472 |
if (ti.map5 & 0xE0) |
|
473 |
return CMD_ERROR; |
|
474 |
||
475 |
if (ti.map5 & 8) {
|
|
476 |
m5 = 5; |
|
477 |
if (rail_bit != 1) |
|
478 |
return CMD_ERROR; |
|
479 |
} else {
|
|
480 |
m5 = 10; |
|
481 |
if (rail_bit != 2) |
|
482 |
return CMD_ERROR; |
|
483 |
} |
|
484 |
||
485 |
if (!(flags & DC_EXEC)) |
|
486 |
return _price.remove_rail; |
|
487 |
||
488 |
_map5[tile] = m5; |
|
489 |
_map_owner[tile] = _map3_lo[tile]; |
|
490 |
_map2[tile] = 0; |
|
491 |
} else {
|
|
492 |
assert(ti.type == MP_RAILWAY); |
|
493 |
||
494 |
if (ti.map5 & RAIL_TYPE_SPECIAL) |
|
495 |
return CMD_ERROR; |
|
496 |
||
497 |
if (!(ti.map5 & rail_bit)) |
|
498 |
return CMD_ERROR; |
|
499 |
||
500 |
// don't allow remove if there are signals on the track |
|
501 |
if (ti.map5 & RAIL_TYPE_SIGNALS) {
|
|
502 |
if (_map3_lo[tile] & _signals_table_both[p2]) |
|
503 |
return CMD_ERROR; |
|
504 |
} |
|
505 |
||
506 |
if (!(flags & DC_EXEC)) |
|
507 |
return _price.remove_rail; |
|
508 |
||
509 |
if ( (_map5[tile] ^= rail_bit) == 0) {
|
|
510 |
DoClearSquare(tile); |
|
511 |
goto skip_mark_dirty; |
|
512 |
} |
|
513 |
} |
|
514 |
||
515 |
/* mark_dirty */ |
|
516 |
MarkTileDirtyByTile(tile); |
|
517 |
||
518 |
skip_mark_dirty:; |
|
519 |
||
520 |
SetSignalsOnBothDir(tile, (byte)p2); |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
521 |
|
| 0 | 522 |
return _price.remove_rail; |
523 |
} |
|
524 |
||
525 |
static const struct {
|
|
526 |
int8 xinc[16]; |
|
527 |
int8 yinc[16]; |
|
528 |
} _railbit = {{
|
|
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
529 |
// 0 1 2 3 4 5 |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
530 |
-16, 0,-16, 0, 16, 0, 0, 0, |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
531 |
16, 0, 0, 16, 0,-16, 0, 0, |
| 0 | 532 |
},{
|
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
533 |
0, 16, 0, 16, 0, 16, 0, 0, |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
534 |
0,-16,-16, 0,-16, 0, 0, 0, |
| 0 | 535 |
}}; |
536 |
||
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
537 |
static int32 ValidateAutoDrag(int *railbit, int x, int y, int ex, int ey) |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
538 |
{
|
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
539 |
int dx, dy, trdx, trdy; |
| 0 | 540 |
|
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
541 |
if (*railbit > 5) return CMD_ERROR; // only 6 possible track-combinations |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
542 |
|
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
543 |
// calculate delta x,y from start to end tile |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
544 |
dx = ex - x; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
545 |
dy = ey - y; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
546 |
|
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
547 |
// calculate delta x,y for the first direction |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
548 |
trdx = _railbit.xinc[*railbit]; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
549 |
trdy = _railbit.yinc[*railbit]; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
550 |
|
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
551 |
if (*railbit & 0x6) {
|
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
552 |
trdx += _railbit.xinc[*railbit ^ 1]; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
553 |
trdy += _railbit.yinc[*railbit ^ 1]; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
554 |
} |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
555 |
|
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
556 |
// validate the direction |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
557 |
while (((trdx <= 0) && (dx > 0)) || ((trdx >= 0) && (dx < 0)) || |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
558 |
((trdy <= 0) && (dy > 0)) || ((trdy >= 0) && (dy < 0))) {
|
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
559 |
if (*railbit < 8) { // first direction is invalid, try the other
|
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
560 |
SETBIT(*railbit, 3); |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
561 |
trdx = -trdx; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
562 |
trdy = -trdy; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
563 |
} else // other direction is invalid too, invalid drag |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
564 |
return CMD_ERROR; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
565 |
} |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
566 |
|
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
567 |
// (for diagonal tracks, this is already made sure of by above test), but: |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
568 |
// for non-diagonal tracks, check if the start and end tile are on 1 line |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
569 |
if (*railbit & 0x6) {
|
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
570 |
trdx = _railbit.xinc[*railbit]; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
571 |
trdy = _railbit.yinc[*railbit]; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
572 |
if ((abs(dx) != abs(dy)) && (abs(dx) + abs(trdy) != abs(dy) + abs(trdx))) |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
573 |
return CMD_ERROR; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
574 |
} |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
575 |
|
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
576 |
return 0; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
577 |
} |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
578 |
|
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
579 |
/* Build a stretch of railroad tracks. |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
580 |
* x,y= start tile |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
581 |
* p1 = end tile |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
582 |
* p2 = (bit 0-3) - railroad type normal/maglev |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
583 |
* p2 = (bit 4-6) - track-orientation, valid values: 0-5 |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
584 |
* p2 = (bit 7) - 0 = build, 1 = remove tracks |
| 0 | 585 |
*/ |
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
586 |
static int32 CmdRailTrackHelper(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
587 |
{
|
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
588 |
int ex, ey; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
589 |
int32 ret, total_cost = 0; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
590 |
int railbit = (p2 >> 4) & 7; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
591 |
byte mode = HASBIT(p2, 7); |
| 0 | 592 |
|
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
593 |
/* unpack end point */ |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
594 |
ex = TileX(p1) * 16; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
595 |
ey = TileY(p1) * 16; |
| 0 | 596 |
|
|
889
7f8630bfea41
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
826
diff
changeset
|
597 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
|
7f8630bfea41
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
826
diff
changeset
|
598 |
|
| 0 | 599 |
if (flags & DC_EXEC) |
| 541 | 600 |
SndPlayTileFx(SND_20_SPLAT_2, TILE_FROM_XY(x,y)); |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
601 |
|
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
602 |
if (ValidateAutoDrag(&railbit, x, y, ex, ey) == CMD_ERROR) |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
603 |
return CMD_ERROR; |
| 0 | 604 |
|
605 |
for(;;) {
|
|
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
606 |
ret = DoCommand(x, y, p2&0x3, railbit&7, flags, (mode == 0) ? CMD_BUILD_SINGLE_RAIL : CMD_REMOVE_SINGLE_RAIL); |
| 0 | 607 |
|
608 |
if (ret == CMD_ERROR) {
|
|
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
609 |
if ((_error_message != STR_1007_ALREADY_BUILT) && (mode == 0)) |
| 0 | 610 |
break; |
611 |
} else |
|
612 |
total_cost += ret; |
|
613 |
||
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
614 |
if (x == ex && y == ey) |
| 0 | 615 |
break; |
616 |
||
617 |
x += _railbit.xinc[railbit]; |
|
618 |
y += _railbit.yinc[railbit]; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
619 |
|
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
620 |
// toggle railbit for the non-diagonal tracks |
| 0 | 621 |
if (railbit & 0x6) railbit ^= 1; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
622 |
} |
| 0 | 623 |
|
624 |
if (total_cost == 0) |
|
625 |
return CMD_ERROR; |
|
626 |
||
627 |
return total_cost; |
|
628 |
} |
|
629 |
||
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
630 |
int32 CmdBuildRailroadTrack(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
631 |
{
|
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
632 |
return CmdRailTrackHelper(x, y, flags, p1, p2); |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
633 |
} |
| 0 | 634 |
|
635 |
int32 CmdRemoveRailroadTrack(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
|
636 |
{
|
|
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
637 |
return CmdRailTrackHelper(x, y, flags, p1, SETBIT(p2, 7)); |
| 0 | 638 |
} |
639 |
||
640 |
/* Build a train depot |
|
641 |
* p1 = rail type |
|
642 |
* p2 = depot direction |
|
643 |
*/ |
|
644 |
int32 CmdBuildTrainDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
|
645 |
{
|
|
646 |
uint tile = TILE_FROM_XY(x,y); |
|
647 |
int32 cost, ret; |
|
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1247
diff
changeset
|
648 |
Depot *depot; |
| 0 | 649 |
uint tileh; |
650 |
||
651 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
|
652 |
||
653 |
if (!EnsureNoVehicle(tile)) return CMD_ERROR; |
|
654 |
||
655 |
tileh = GetTileSlope(tile, NULL); |
|
656 |
if (tileh != 0) {
|
|
|
84
1e0721c29bad
(svn r85) -Add: initial commit of new AI (enable in Patch menu)
truelight
parents:
59
diff
changeset
|
657 |
if ((!_patches.ainew_active && _is_ai_player) || !_patches.build_on_slopes || (tileh & 0x10 || !((0x4C >> p2) & tileh) )) |
| 0 | 658 |
return_cmd_error(STR_0007_FLAT_LAND_REQUIRED); |
659 |
} |
|
660 |
||
661 |
ret = DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); |
|
662 |
if (ret == CMD_ERROR) return CMD_ERROR; |
|
663 |
cost = ret; |
|
664 |
||
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1247
diff
changeset
|
665 |
depot = AllocateDepot(); |
|
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1247
diff
changeset
|
666 |
if (depot == NULL) |
| 0 | 667 |
return CMD_ERROR; |
668 |
||
669 |
if (flags & DC_EXEC) {
|
|
670 |
if (_current_player == _local_player) |
|
671 |
_last_built_train_depot_tile = (TileIndex)tile; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
672 |
|
|
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
673 |
ModifyTile(tile, |
| 0 | 674 |
MP_SETTYPE(MP_RAILWAY) | |
675 |
MP_MAP3LO | MP_MAPOWNER_CURRENT | MP_MAP5, |
|
676 |
p1, /* map3_lo */ |
|
677 |
p2 | RAIL_TYPE_DEPOT /* map5 */ |
|
678 |
); |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
679 |
|
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1247
diff
changeset
|
680 |
depot->xy = tile; |
|
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1247
diff
changeset
|
681 |
depot->town_index = ClosestTownFromTile(tile, (uint)-1)->index; |
| 0 | 682 |
|
683 |
SetSignalsOnBothDir(tile, (p2&1) ? 2 : 1); |
|
684 |
||
685 |
} |
|
686 |
||
687 |
return cost + _price.build_train_depot; |
|
688 |
} |
|
689 |
||
| 1084 | 690 |
/* build signals, alternate between double/single, signal/semaphore, |
691 |
* pre/exit/combo-signals |
|
692 |
* p1 bits 0-2 - track-orientation, valid values: 0-5 |
|
693 |
* p1 bit 3 - choose semaphores/signals or cycle normal/pre/exit/combo |
|
694 |
* depending on context |
|
695 |
* p2 = used for CmdBuildManySignals() to copy style of first signal |
|
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
696 |
*/ |
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
697 |
int32 CmdBuildSingleSignal(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
| 0 | 698 |
{
|
| 1084 | 699 |
TileIndex tile = TILE_FROM_XY(x, y); |
700 |
bool semaphore; |
|
701 |
bool pre_signal; |
|
702 |
uint track = p1 & 0x7; |
|
| 0 | 703 |
byte m5; |
704 |
int32 cost; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
705 |
|
| 1084 | 706 |
if (!(track < 6) || // only 6 possible track-combinations |
707 |
!IsTileType(tile, MP_RAILWAY) || |
|
708 |
!EnsureNoVehicle(tile)) |
|
| 0 | 709 |
return CMD_ERROR; |
710 |
||
| 1084 | 711 |
// Protect against invalid signal copying |
712 |
if (p2 != 0 && (p2 & _signals_table_both[track]) == 0) |
|
| 0 | 713 |
return CMD_ERROR; |
714 |
||
| 1084 | 715 |
m5 = _map5[tile]; |
716 |
||
717 |
if (m5 & 0x80 || // mustn't be a depot |
|
718 |
!HASBIT(m5, track)) // track must exist |
|
719 |
return CMD_ERROR; |
|
720 |
||
721 |
if (!CheckTileOwnership(tile)) return CMD_ERROR; |
|
722 |
||
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
723 |
_error_message = STR_1005_NO_SUITABLE_RAILROAD_TRACK; |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
724 |
|
| 0 | 725 |
{
|
726 |
byte m = m5 & RAIL_BIT_MASK; |
|
| 1084 | 727 |
if (m != RAIL_BIT_DIAG1 && |
728 |
m != RAIL_BIT_DIAG2 && |
|
729 |
m != RAIL_BIT_UPPER && |
|
730 |
m != RAIL_BIT_LOWER && |
|
731 |
m != RAIL_BIT_LEFT && |
|
732 |
m != RAIL_BIT_RIGHT && |
|
733 |
m != (RAIL_BIT_UPPER | RAIL_BIT_LOWER) && |
|
734 |
m != (RAIL_BIT_LEFT | RAIL_BIT_RIGHT)) |
|
| 0 | 735 |
return CMD_ERROR; |
736 |
} |
|
737 |
||
| 1084 | 738 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
| 0 | 739 |
|
| 1084 | 740 |
// Same bit, used in different contexts |
741 |
semaphore = pre_signal = HASBIT(p1, 3); |
|
|
1066
aad3c6ad147f
(svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid)
darkvater
parents:
1059
diff
changeset
|
742 |
|
| 1084 | 743 |
if ((_map3_lo[tile] & _signals_table_both[track]) == 0) {
|
744 |
// build new signals |
|
| 0 | 745 |
cost = _price.build_signals; |
|
1066
aad3c6ad147f
(svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid)
darkvater
parents:
1059
diff
changeset
|
746 |
} else {
|
| 1084 | 747 |
if (p2 != 0 && |
748 |
((semaphore && !HASBIT(_map3_hi[tile], 2)) || |
|
749 |
(!semaphore && HASBIT(_map3_hi[tile], 2)))) {
|
|
750 |
// convert signals <-> semaphores |
|
751 |
cost = _price.build_signals + _price.remove_signals; |
|
752 |
} else {
|
|
753 |
// it is free to change orientation/pre-exit-combo signals |
|
754 |
cost = 0; |
|
755 |
} |
|
| 0 | 756 |
} |
757 |
||
758 |
if (flags & DC_EXEC) {
|
|
| 1084 | 759 |
if (!(m5 & RAIL_TYPE_SIGNALS)) {
|
760 |
// there are no signals at all on this tile yet |
|
| 0 | 761 |
_map5[tile] |= RAIL_TYPE_SIGNALS; // change into signals |
762 |
_map2[tile] |= 0xF0; // all signals are on |
|
763 |
_map3_lo[tile] &= ~0xF0; // no signals built by default |
|
| 1084 | 764 |
_map3_hi[tile] = semaphore ? 4 : 0; |
| 0 | 765 |
} |
766 |
||
| 1084 | 767 |
if (p2 == 0) {
|
768 |
if ((_map3_lo[tile] & _signals_table_both[track]) == 0) {
|
|
769 |
// build new signals |
|
770 |
_map3_lo[tile] |= _signals_table_both[track]; |
|
771 |
} else {
|
|
772 |
if (pre_signal) {
|
|
773 |
// cycle between normal -> pre -> exit -> combo -> ... |
|
774 |
byte type = (_map3_hi[tile] + 1) & 0x03; |
|
775 |
_map3_hi[tile] &= ~0x03; |
|
776 |
_map3_hi[tile] |= type; |
|
777 |
} else {
|
|
778 |
// cycle between two-way -> one-way -> one-way -> ... |
|
779 |
switch (track) {
|
|
780 |
case 3: |
|
781 |
case 5: {
|
|
782 |
byte signal = (_map3_lo[tile] - 0x10) & 0x30; |
|
783 |
if (signal == 0) signal = 0x30; |
|
784 |
_map3_lo[tile] &= ~0x30; |
|
785 |
_map3_lo[tile] |= signal; |
|
786 |
break; |
|
787 |
} |
|
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
788 |
|
| 1084 | 789 |
default: {
|
790 |
byte signal = (_map3_lo[tile] - 0x40) & 0xC0; |
|
791 |
if (signal == 0) signal = 0xC0; |
|
792 |
_map3_lo[tile] &= ~0xC0; |
|
793 |
_map3_lo[tile] |= signal; |
|
794 |
break; |
|
795 |
} |
|
796 |
} |
|
797 |
} |
|
798 |
} |
|
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
799 |
} else {
|
| 1084 | 800 |
/* If CmdBuildManySignals is called with copying signals, just copy the |
801 |
* style of the first signal given as parameter by CmdBuildManySignals */ |
|
802 |
_map3_lo[tile] &= ~_signals_table_both[track]; |
|
803 |
_map3_lo[tile] |= p2 & _signals_table_both[track]; |
|
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
804 |
// convert between signal<->semaphores when dragging |
| 1084 | 805 |
if (semaphore) |
806 |
SETBIT(_map3_hi[tile], 2); |
|
807 |
else |
|
808 |
CLRBIT(_map3_hi[tile], 2); |
|
| 0 | 809 |
} |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
810 |
|
| 0 | 811 |
MarkTileDirtyByTile(tile); |
812 |
SetSignalsOnBothDir(tile, track); |
|
813 |
} |
|
814 |
||
815 |
return cost; |
|
816 |
} |
|
817 |
||
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
818 |
/* Build many signals by dragging: AutoSignals |
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
819 |
* x,y = start tile |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
820 |
* p1 = end tile |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
821 |
* p2 = (bit 0) - 0 = build, 1 = remove signals |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
822 |
* p2 = (bit 3) - 0 = signals, 1 = semaphores |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
823 |
* p2 = (bit 4-6) - track-orientation, valid values: 0-5 |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
824 |
* p2 = (bit 24-31) - user defined signals_density |
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
825 |
*/ |
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
826 |
static int32 CmdSignalTrackHelper(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
827 |
{
|
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
828 |
int ex, ey; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
829 |
int railbit = (p2 >> 4) & 7; |
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
830 |
bool error = true; |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
831 |
TileIndex tile = TILE_FROM_XY(x, y); |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
832 |
int32 ret, total_cost, signal_ctr; |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
833 |
byte m5, semaphores = (HASBIT(p2, 3)) ? 8 : 0; |
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
834 |
int mode = p2 & 0x1; |
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
835 |
// for vertical/horizontal tracks, double the given signals density |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
836 |
// since the original amount will be too dense (shorter tracks) |
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
837 |
byte signal_density = (railbit & 0x6) ? (p2 >> 24) * 2: (p2 >> 24); |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
838 |
byte signals; |
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
839 |
|
|
889
7f8630bfea41
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
826
diff
changeset
|
840 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
|
7f8630bfea41
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
826
diff
changeset
|
841 |
|
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
842 |
// unpack end tile |
|
926
bd4312619522
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
tron
parents:
919
diff
changeset
|
843 |
ex = TileX(p1) * 16; |
|
bd4312619522
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
tron
parents:
919
diff
changeset
|
844 |
ey = TileY(p1) * 16; |
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
845 |
|
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
846 |
if (ValidateAutoDrag(&railbit, x, y, ex, ey) == CMD_ERROR) |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
847 |
return CMD_ERROR; |
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
848 |
|
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
849 |
// copy the signal-style of the first rail-piece if existing |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
850 |
m5 = _map5[tile]; |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
851 |
if (!(m5 & RAIL_TYPE_SPECIAL) && (m5 & RAIL_BIT_MASK) && (m5 & RAIL_TYPE_SIGNALS)) {
|
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
852 |
signals = _map3_lo[tile] & _signals_table_both[railbit]; |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
853 |
if (signals == 0) signals = _signals_table_both[railbit]; |
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
854 |
|
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
855 |
semaphores = (_map3_hi[tile] & ~3) ? 8 : 0; // copy signal/semaphores style (independent of CTRL) |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
856 |
} else { // no signals exist, drag a two-way signal stretch
|
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
857 |
signals = _signals_table_both[railbit]; |
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
858 |
} |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
859 |
|
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
860 |
/* signal_density_ctr - amount of tiles already processed |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
861 |
* signals_density - patch setting to put signal on every Nth tile (double space on |, -- tracks) |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
862 |
********** |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
863 |
* railbit - direction of autorail |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
864 |
* semaphores - semaphores or signals |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
865 |
* signals - is there a signal/semaphore on the first tile, copy its style (two-way/single-way) |
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
866 |
and convert all others to semaphore/signal |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
867 |
* mode - 1 remove signals, 0 build signals */ |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
868 |
signal_ctr = total_cost = 0; |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
869 |
for(;;) {
|
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
870 |
// only build/remove signals with the specified density |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
871 |
if ((signal_ctr % signal_density) == 0 ) {
|
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
872 |
ret = DoCommand(x, y, (railbit & 7) | semaphores, signals, flags, (mode == 1) ? CMD_REMOVE_SIGNALS : CMD_BUILD_SIGNALS); |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
873 |
|
| 826 | 874 |
/* Abort placement for any other error than NOT_SUITABLE_TRACK |
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
875 |
* This includes vehicles on track, competitor's tracks, etc. */ |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
876 |
if (ret == CMD_ERROR) {
|
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
877 |
if (_error_message != STR_1005_NO_SUITABLE_RAILROAD_TRACK && mode != 1) {
|
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
878 |
return CMD_ERROR; |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
879 |
} |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
880 |
} else {
|
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
881 |
error = false; |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
882 |
total_cost += ret; |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
883 |
} |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
884 |
} |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
885 |
|
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
886 |
if (ex == x && ey == y) // reached end of drag |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
887 |
break; |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
888 |
|
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
889 |
x += _railbit.xinc[railbit]; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
890 |
y += _railbit.yinc[railbit]; |
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
891 |
signal_ctr++; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
892 |
|
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
893 |
// toggle railbit for the non-diagonal tracks (|, -- tracks) |
|
58
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
894 |
if (railbit & 0x6) railbit ^= 1; |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
895 |
} |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
896 |
|
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
897 |
return (error) ? CMD_ERROR : total_cost; |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
898 |
} |
|
b9fdcc9b5c90
(svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater)
darkvater
parents:
39
diff
changeset
|
899 |
|
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
900 |
/* Stub for the unified Signal builder/remover */ |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
901 |
int32 CmdBuildSignalTrack(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
902 |
{
|
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
903 |
return CmdSignalTrackHelper(x, y, flags, p1, p2); |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
904 |
} |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
905 |
|
| 0 | 906 |
/* Remove signals |
|
1518
ade7a74ac31a
(svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function
tron
parents:
1477
diff
changeset
|
907 |
* p1 bits 0-2 = track, valid values: 0-5 |
| 0 | 908 |
* p2 = unused |
909 |
*/ |
|
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
910 |
int32 CmdRemoveSingleSignal(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
| 0 | 911 |
{
|
|
1518
ade7a74ac31a
(svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function
tron
parents:
1477
diff
changeset
|
912 |
TileIndex tile = TILE_FROM_XY(x, y); |
|
ade7a74ac31a
(svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function
tron
parents:
1477
diff
changeset
|
913 |
uint track = p1 & 0x7; |
|
ade7a74ac31a
(svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function
tron
parents:
1477
diff
changeset
|
914 |
|
|
ade7a74ac31a
(svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function
tron
parents:
1477
diff
changeset
|
915 |
if (!(track < 6) || // only 6 possible track-combinations |
|
ade7a74ac31a
(svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function
tron
parents:
1477
diff
changeset
|
916 |
!IsTileType(tile, MP_RAILWAY) || |
|
ade7a74ac31a
(svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function
tron
parents:
1477
diff
changeset
|
917 |
!EnsureNoVehicle(tile)) |
|
ade7a74ac31a
(svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function
tron
parents:
1477
diff
changeset
|
918 |
return CMD_ERROR; |
|
ade7a74ac31a
(svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function
tron
parents:
1477
diff
changeset
|
919 |
|
|
ade7a74ac31a
(svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function
tron
parents:
1477
diff
changeset
|
920 |
if ((_map5[tile] & RAIL_TYPE_MASK) != RAIL_TYPE_SIGNALS || |
|
ade7a74ac31a
(svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function
tron
parents:
1477
diff
changeset
|
921 |
(_map3_lo[tile] & _signals_table_both[track]) == 0) // signals on track? |
|
ade7a74ac31a
(svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function
tron
parents:
1477
diff
changeset
|
922 |
return CMD_ERROR; |
|
ade7a74ac31a
(svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function
tron
parents:
1477
diff
changeset
|
923 |
|
|
1536
69c91cec07c5
(svn r2040) Readd check that got accidently removed in r2022
tron
parents:
1535
diff
changeset
|
924 |
if (_current_player != OWNER_WATER && !CheckTileOwnership(tile)) |
|
69c91cec07c5
(svn r2040) Readd check that got accidently removed in r2022
tron
parents:
1535
diff
changeset
|
925 |
return CMD_ERROR; |
| 0 | 926 |
|
927 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
|
928 |
||
929 |
/* Do it? */ |
|
930 |
if (flags & DC_EXEC) {
|
|
|
1518
ade7a74ac31a
(svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function
tron
parents:
1477
diff
changeset
|
931 |
_map3_lo[tile] &= ~_signals_table_both[track]; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
932 |
|
|
1066
aad3c6ad147f
(svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid)
darkvater
parents:
1059
diff
changeset
|
933 |
/* removed last signal from tile? */ |
|
aad3c6ad147f
(svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid)
darkvater
parents:
1059
diff
changeset
|
934 |
if ((_map3_lo[tile] & 0xF0) == 0) {
|
|
aad3c6ad147f
(svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid)
darkvater
parents:
1059
diff
changeset
|
935 |
_map5[tile] &= ~RAIL_TYPE_SIGNALS; |
|
aad3c6ad147f
(svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid)
darkvater
parents:
1059
diff
changeset
|
936 |
_map2[tile] &= ~0xF0; |
|
aad3c6ad147f
(svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid)
darkvater
parents:
1059
diff
changeset
|
937 |
CLRBIT(_map3_hi[tile], 2); // remove any possible semaphores |
|
aad3c6ad147f
(svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid)
darkvater
parents:
1059
diff
changeset
|
938 |
} |
|
1109
1bab892228cd
(svn r1610) Remove trailing whitespace (last time ever, i hope)
tron
parents:
1095
diff
changeset
|
939 |
|
|
1066
aad3c6ad147f
(svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid)
darkvater
parents:
1059
diff
changeset
|
940 |
SetSignalsOnBothDir(tile, track); |
| 0 | 941 |
|
942 |
MarkTileDirtyByTile(tile); |
|
943 |
} |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
944 |
|
| 0 | 945 |
return _price.remove_signals; |
946 |
} |
|
947 |
||
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
948 |
/* Stub for the unified Signal builder/remover */ |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
949 |
int32 CmdRemoveSignalTrack(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
950 |
{
|
|
1229
4c965ad79a0b
(svn r1733) - Fix: oops "| 1" is SETBIT(x, 0), not 1 :(. Now you can remove signals again
darkvater
parents:
1227
diff
changeset
|
951 |
return CmdSignalTrackHelper(x, y, flags, p1, SETBIT(p2, 0)); |
|
1227
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
952 |
} |
|
3552f20fcfcb
(svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid!
darkvater
parents:
1209
diff
changeset
|
953 |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
954 |
typedef int32 DoConvertRailProc(uint tile, uint totype, bool exec); |
| 0 | 955 |
|
956 |
static int32 DoConvertRail(uint tile, uint totype, bool exec) |
|
957 |
{
|
|
958 |
if (!CheckTileOwnership(tile) || !EnsureNoVehicle(tile)) |
|
959 |
return CMD_ERROR; |
|
960 |
||
961 |
// tile is already of requested type? |
|
962 |
if ( (uint)(_map3_lo[tile] & 0xF) == totype) |
|
963 |
return CMD_ERROR; |
|
964 |
||
965 |
// change type. |
|
966 |
if (exec) {
|
|
967 |
_map3_lo[tile] = (_map3_lo[tile] & 0xF0) + totype; |
|
968 |
MarkTileDirtyByTile(tile); |
|
969 |
} |
|
970 |
||
971 |
return _price.build_rail >> 1; |
|
972 |
} |
|
973 |
||
974 |
extern int32 DoConvertStationRail(uint tile, uint totype, bool exec); |
|
975 |
extern int32 DoConvertStreetRail(uint tile, uint totype, bool exec); |
|
976 |
extern int32 DoConvertTunnelBridgeRail(uint tile, uint totype, bool exec); |
|
977 |
||
978 |
// p1 = start tile |
|
979 |
// p2 = new railtype |
|
980 |
int32 CmdConvertRail(int ex, int ey, uint32 flags, uint32 p1, uint32 p2) |
|
981 |
{
|
|
982 |
int32 ret, cost, money; |
|
983 |
int sx,sy,x,y; |
|
984 |
||
|
889
7f8630bfea41
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
826
diff
changeset
|
985 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
|
7f8630bfea41
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
826
diff
changeset
|
986 |
|
| 0 | 987 |
// make sure sx,sy are smaller than ex,ey |
|
926
bd4312619522
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
tron
parents:
919
diff
changeset
|
988 |
sx = TileX(p1) * 16; |
|
bd4312619522
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
tron
parents:
919
diff
changeset
|
989 |
sy = TileY(p1) * 16; |
| 0 | 990 |
if (ex < sx) intswap(ex, sx); |
991 |
if (ey < sy) intswap(ey, sy); |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
992 |
|
| 0 | 993 |
money = GetAvailableMoneyForCommand(); |
994 |
ret = false; |
|
995 |
cost = 0; |
|
996 |
for(x=sx; x<=ex; x+=16) {
|
|
997 |
for(y=sy; y<=ey; y+=16) {
|
|
998 |
uint tile = TILE_FROM_XY(x,y); |
|
999 |
DoConvertRailProc *p; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1000 |
|
|
1035
0a170deb6e33
(svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts
tron
parents:
1024
diff
changeset
|
1001 |
if (IsTileType(tile, MP_RAILWAY)) p = DoConvertRail; |
|
0a170deb6e33
(svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts
tron
parents:
1024
diff
changeset
|
1002 |
else if (IsTileType(tile, MP_STATION)) p = DoConvertStationRail; |
|
0a170deb6e33
(svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts
tron
parents:
1024
diff
changeset
|
1003 |
else if (IsTileType(tile, MP_STREET)) p = DoConvertStreetRail; |
|
0a170deb6e33
(svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts
tron
parents:
1024
diff
changeset
|
1004 |
else if (IsTileType(tile, MP_TUNNELBRIDGE)) p = DoConvertTunnelBridgeRail; |
| 0 | 1005 |
else continue; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1006 |
|
| 0 | 1007 |
ret = p(tile, p2, false); |
1008 |
if (ret == CMD_ERROR) continue; |
|
1009 |
cost += ret; |
|
1010 |
||
1011 |
if (flags & DC_EXEC) {
|
|
1012 |
if ( (money -= ret) < 0) { _additional_cash_required = ret; return cost - ret; }
|
|
1013 |
p(tile, p2, true); |
|
1014 |
} |
|
1015 |
} |
|
1016 |
} |
|
1017 |
if (cost == 0) cost = CMD_ERROR; |
|
1018 |
return cost; |
|
1019 |
} |
|
1020 |
||
1021 |
static int32 RemoveTrainDepot(uint tile, uint32 flags) |
|
1022 |
{
|
|
|
149
5f7d4b21df01
(svn r150) -Fix: [1010833] Turning on the magic bulldozer removes oil rigs
darkvater
parents:
84
diff
changeset
|
1023 |
if (!CheckTileOwnership(tile) && _current_player != OWNER_WATER) |
| 0 | 1024 |
return CMD_ERROR; |
1025 |
||
1026 |
if (!EnsureNoVehicle(tile)) |
|
1027 |
return CMD_ERROR; |
|
1028 |
||
1029 |
if (flags & DC_EXEC) {
|
|
1030 |
int track = _map5[tile] & RAIL_DEPOT_TRACK_MASK; |
|
1031 |
||
1032 |
DoDeleteDepot(tile); |
|
1033 |
SetSignalsOnBothDir(tile, track); |
|
1034 |
} |
|
1035 |
||
1036 |
return _price.remove_train_depot; |
|
1037 |
} |
|
1038 |
||
|
1534
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1039 |
static int32 ClearTile_Track(TileIndex tile, byte flags) |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1040 |
{
|
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1041 |
int32 cost; |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1042 |
int32 ret; |
| 0 | 1043 |
byte m5; |
1044 |
||
1045 |
m5 = _map5[tile]; |
|
1046 |
||
1047 |
if (flags & DC_AUTO) {
|
|
1048 |
if (m5 & RAIL_TYPE_SPECIAL) |
|
1049 |
return_cmd_error(STR_2004_BUILDING_MUST_BE_DEMOLISHED); |
|
1050 |
||
1051 |
if (_map_owner[tile] != _current_player) |
|
1052 |
return_cmd_error(STR_1024_AREA_IS_OWNED_BY_ANOTHER); |
|
1053 |
||
1054 |
return_cmd_error(STR_1008_MUST_REMOVE_RAILROAD_TRACK); |
|
1055 |
} |
|
1056 |
||
1057 |
cost = 0; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1058 |
|
|
1534
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1059 |
switch (m5 & RAIL_TYPE_MASK) {
|
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1060 |
case RAIL_TYPE_SIGNALS: |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1061 |
if (_map3_lo[tile] & _signals_table_both[0]) {
|
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1062 |
ret = DoCommandByTile(tile, 0, 0, flags, CMD_REMOVE_SIGNALS); |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1063 |
if (ret == CMD_ERROR) return CMD_ERROR; |
| 0 | 1064 |
cost += ret; |
1065 |
} |
|
|
1534
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1066 |
if (_map3_lo[tile] & _signals_table_both[3]) {
|
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1067 |
ret = DoCommandByTile(tile, 3, 0, flags, CMD_REMOVE_SIGNALS); |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1068 |
if (ret == CMD_ERROR) return CMD_ERROR; |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1069 |
cost += ret; |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1070 |
} |
| 0 | 1071 |
|
|
1534
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1072 |
m5 &= RAIL_BIT_MASK; |
|
1598
4425f756c19b
(svn r2102) Fix bug introduced in r2038, which gave you money for clearing occupied railway tiles ([1171926])
tron
parents:
1591
diff
changeset
|
1073 |
if (!(flags & DC_EXEC)) {
|
|
4425f756c19b
(svn r2102) Fix bug introduced in r2038, which gave you money for clearing occupied railway tiles ([1171926])
tron
parents:
1591
diff
changeset
|
1074 |
for (; m5 != 0; m5 >>= 1) if (m5 & 1) cost += _price.remove_rail; |
|
4425f756c19b
(svn r2102) Fix bug introduced in r2038, which gave you money for clearing occupied railway tiles ([1171926])
tron
parents:
1591
diff
changeset
|
1075 |
return cost; |
|
4425f756c19b
(svn r2102) Fix bug introduced in r2038, which gave you money for clearing occupied railway tiles ([1171926])
tron
parents:
1591
diff
changeset
|
1076 |
} |
|
1534
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1077 |
/* FALLTHROUGH */ |
|
1109
1bab892228cd
(svn r1610) Remove trailing whitespace (last time ever, i hope)
tron
parents:
1095
diff
changeset
|
1078 |
|
|
1534
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1079 |
case RAIL_TYPE_NORMAL: {
|
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1080 |
uint i; |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1081 |
|
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1082 |
for (i = 0; m5 != 0; i++, m5 >>= 1) {
|
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1083 |
if (m5 & 1) {
|
|
1598
4425f756c19b
(svn r2102) Fix bug introduced in r2038, which gave you money for clearing occupied railway tiles ([1171926])
tron
parents:
1591
diff
changeset
|
1084 |
ret = DoCommandByTile(tile, 0, i, flags, CMD_REMOVE_SINGLE_RAIL); |
|
4425f756c19b
(svn r2102) Fix bug introduced in r2038, which gave you money for clearing occupied railway tiles ([1171926])
tron
parents:
1591
diff
changeset
|
1085 |
if (ret == CMD_ERROR) return CMD_ERROR; |
|
1534
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1086 |
cost += ret; |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1087 |
} |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1088 |
} |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1089 |
return cost; |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1090 |
} |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1091 |
|
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1092 |
case RAIL_TYPE_DEPOT: |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1093 |
switch (m5 & RAIL_SUBTYPE_MASK) {
|
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1094 |
case RAIL_SUBTYPE_DEPOT: |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1095 |
return RemoveTrainDepot(tile, flags); |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1096 |
|
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1097 |
case RAIL_SUBTYPE_WAYPOINT: |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1098 |
return RemoveTrainWaypoint(tile, flags, false); |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1099 |
|
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1100 |
default: |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1101 |
return CMD_ERROR; |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1102 |
} |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1103 |
|
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1104 |
default: |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1105 |
return CMD_ERROR; |
|
2f7388d38291
(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals
tron
parents:
1518
diff
changeset
|
1106 |
} |
| 0 | 1107 |
} |
1108 |
||
1109 |
||
1110 |
||
1111 |
#include "table/track_land.h" |
|
1112 |
||
1113 |
// used for presignals |
|
1114 |
static const SpriteID _signal_base_sprites[16] = {
|
|
1115 |
0x4FB, |
|
1116 |
0x1323, |
|
1117 |
0x1333, |
|
1118 |
0x1343, |
|
1119 |
||
1120 |
// use semaphores instead of signals? |
|
1121 |
0x1353, |
|
1122 |
0x1363, |
|
1123 |
0x1373, |
|
1124 |
0x1383, |
|
1125 |
||
1126 |
// mirrored versions |
|
1127 |
0x4FB, |
|
1128 |
0x1323, |
|
1129 |
0x1333, |
|
1130 |
0x1343, |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1131 |
|
| 0 | 1132 |
0x13C6, |
1133 |
0x13D6, |
|
1134 |
0x13E6, |
|
1135 |
0x13F6, |
|
1136 |
}; |
|
1137 |
||
1138 |
// used to determine the side of the road for the signal |
|
1139 |
static const byte _signal_position[24] = {
|
|
1140 |
/* original: left side position */ |
|
1141 |
0x58,0x1E,0xE1,0xB9,0x01,0xA3,0x4B,0xEE,0x3B,0xD4,0x43,0xBD, |
|
1142 |
/* patch: ride side position */ |
|
1143 |
0x1E,0xAC,0x64,0xE1,0x4A,0x10,0xEE,0xC5,0xDB,0x34,0x4D,0xB3 |
|
1144 |
}; |
|
1145 |
||
1146 |
static void DrawSignalHelper(TileInfo *ti, byte condition, uint32 image_and_pos) |
|
1147 |
{
|
|
1148 |
bool otherside = _opt.road_side & _patches.signal_side; |
|
1149 |
||
1150 |
uint v = _signal_position[(image_and_pos & 0xF) + (otherside ? 12 : 0)]; |
|
1151 |
uint x = ti->x | (v&0xF); |
|
1152 |
uint y = ti->y | (v>>4); |
|
1153 |
uint sprite = _signal_base_sprites[(_map3_hi[ti->tile] & 7) + (otherside ? 8 : 0)] + (image_and_pos>>4) + ((condition != 0) ? 1 : 0); |
|
1154 |
AddSortableSpriteToDraw(sprite, x, y, 1, 1, 10, GetSlopeZ(x,y)); |
|
1155 |
} |
|
1156 |
||
1157 |
static uint32 _drawtile_track_palette; |
|
1158 |
||
1159 |
||
1160 |
static void DrawTrackFence_NW(TileInfo *ti) |
|
1161 |
{
|
|
1162 |
uint32 image = 0x515; |
|
1163 |
if (ti->tileh != 0) {
|
|
1164 |
image = 0x519; |
|
1165 |
if (!(ti->tileh & 2)) {
|
|
1166 |
image = 0x51B; |
|
1167 |
} |
|
1168 |
} |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1169 |
AddSortableSpriteToDraw(image | _drawtile_track_palette, |
| 0 | 1170 |
ti->x, ti->y+1, 16, 1, 4, ti->z); |
1171 |
} |
|
1172 |
||
1173 |
static void DrawTrackFence_SE(TileInfo *ti) |
|
1174 |
{
|
|
1175 |
uint32 image = 0x515; |
|
1176 |
if (ti->tileh != 0) {
|
|
1177 |
image = 0x519; |
|
1178 |
if (!(ti->tileh & 2)) {
|
|
1179 |
image = 0x51B; |
|
1180 |
} |
|
1181 |
} |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1182 |
AddSortableSpriteToDraw(image | _drawtile_track_palette, |
| 0 | 1183 |
ti->x, ti->y+15, 16, 1, 4, ti->z); |
1184 |
} |
|
1185 |
||
1186 |
static void DrawTrackFence_NW_SE(TileInfo *ti) |
|
1187 |
{
|
|
1188 |
DrawTrackFence_NW(ti); |
|
1189 |
DrawTrackFence_SE(ti); |
|
1190 |
} |
|
1191 |
||
1192 |
static void DrawTrackFence_NE(TileInfo *ti) |
|
1193 |
{
|
|
1194 |
uint32 image = 0x516; |
|
1195 |
if (ti->tileh != 0) {
|
|
1196 |
image = 0x51A; |
|
1197 |
if (!(ti->tileh & 2)) {
|
|
1198 |
image = 0x51C; |
|
1199 |
} |
|
1200 |
} |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1201 |
AddSortableSpriteToDraw(image | _drawtile_track_palette, |
| 0 | 1202 |
ti->x+1, ti->y, 1, 16, 4, ti->z); |
1203 |
} |
|
1204 |
||
1205 |
static void DrawTrackFence_SW(TileInfo *ti) |
|
1206 |
{
|
|
1207 |
uint32 image = 0x516; |
|
1208 |
if (ti->tileh != 0) {
|
|
1209 |
image = 0x51A; |
|
1210 |
if (!(ti->tileh & 2)) {
|
|
1211 |
image = 0x51C; |
|
1212 |
} |
|
1213 |
} |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1214 |
AddSortableSpriteToDraw(image | _drawtile_track_palette, |
| 0 | 1215 |
ti->x+15, ti->y, 1, 16, 4, ti->z); |
1216 |
} |
|
1217 |
||
1218 |
static void DrawTrackFence_NE_SW(TileInfo *ti) |
|
1219 |
{
|
|
1220 |
DrawTrackFence_NE(ti); |
|
1221 |
DrawTrackFence_SW(ti); |
|
1222 |
} |
|
1223 |
||
1224 |
static void DrawTrackFence_NS_1(TileInfo *ti) |
|
1225 |
{
|
|
1226 |
int z = ti->z; |
|
1227 |
if (ti->tileh & 1) |
|
1228 |
z += 8; |
|
1229 |
AddSortableSpriteToDraw(0x517 | _drawtile_track_palette, |
|
1230 |
ti->x + 8, ti->y + 8, 1, 1, 4, z); |
|
1231 |
} |
|
1232 |
||
1233 |
static void DrawTrackFence_NS_2(TileInfo *ti) |
|
1234 |
{
|
|
1235 |
int z = ti->z; |
|
1236 |
if (ti->tileh & 4) |
|
1237 |
z += 8; |
|
1238 |
AddSortableSpriteToDraw(0x517 | _drawtile_track_palette, |
|
1239 |
ti->x + 8, ti->y + 8, 1, 1, 4, z); |
|
1240 |
} |
|
1241 |
||
1242 |
static void DrawTrackFence_WE_1(TileInfo *ti) |
|
1243 |
{
|
|
1244 |
int z = ti->z; |
|
1245 |
if (ti->tileh & 8) |
|
1246 |
z += 8; |
|
1247 |
AddSortableSpriteToDraw(0x518 | _drawtile_track_palette, |
|
1248 |
ti->x + 8, ti->y + 8, 1, 1, 4, z); |
|
1249 |
} |
|
1250 |
||
1251 |
static void DrawTrackFence_WE_2(TileInfo *ti) |
|
1252 |
{
|
|
1253 |
int z = ti->z; |
|
1254 |
if (ti->tileh & 2) |
|
1255 |
z += 8; |
|
1256 |
AddSortableSpriteToDraw(0x518 | _drawtile_track_palette, |
|
1257 |
ti->x + 8, ti->y + 8, 1, 1, 4, z); |
|
1258 |
} |
|
1259 |
||
1260 |
static void DetTrackDrawProc_Null(TileInfo *ti) |
|
1261 |
{
|
|
1262 |
/* nothing should be here */ |
|
1263 |
} |
|
1264 |
||
1265 |
typedef void DetailedTrackProc(TileInfo *ti); |
|
1266 |
DetailedTrackProc * const _detailed_track_proc[16] = {
|
|
1267 |
DetTrackDrawProc_Null, |
|
1268 |
DetTrackDrawProc_Null, |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1269 |
|
| 0 | 1270 |
DrawTrackFence_NW, |
1271 |
DrawTrackFence_SE, |
|
1272 |
DrawTrackFence_NW_SE, |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1273 |
|
| 0 | 1274 |
DrawTrackFence_NE, |
1275 |
DrawTrackFence_SW, |
|
1276 |
DrawTrackFence_NE_SW, |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1277 |
|
| 0 | 1278 |
DrawTrackFence_NS_1, |
1279 |
DrawTrackFence_NS_2, |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1280 |
|
| 0 | 1281 |
DrawTrackFence_WE_1, |
1282 |
DrawTrackFence_WE_2, |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1283 |
|
| 0 | 1284 |
DetTrackDrawProc_Null, |
1285 |
DetTrackDrawProc_Null, |
|
1286 |
DetTrackDrawProc_Null, |
|
1287 |
DetTrackDrawProc_Null, |
|
1288 |
}; |
|
1289 |
||
|
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1290 |
static void DrawSpecialBuilding(uint32 image, uint32 tracktype_offs, |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1291 |
TileInfo *ti, |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1292 |
byte x, byte y, byte z, |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1293 |
byte xsize, byte ysize, byte zsize) |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1294 |
{
|
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1295 |
if (image & 0x8000) |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1296 |
image |= _drawtile_track_palette; |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1297 |
image += tracktype_offs; |
|
497
2d6d31173813
(svn r787) Invert the sense of the DO_TRANS_BUILDINGS flag to be consistent with its own name and all other DO_* flags.
tron
parents:
473
diff
changeset
|
1298 |
if (_display_opt & DO_TRANS_BUILDINGS) // show transparent depots |
|
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1299 |
image = (image & 0x3FFF) | 0x3224000; |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1300 |
AddSortableSpriteToDraw(image, ti->x + x, ti->y + y, xsize, ysize, zsize, ti->z + z); |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1301 |
} |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1302 |
|
| 0 | 1303 |
static void DrawTile_Track(TileInfo *ti) |
1304 |
{
|
|
1305 |
uint32 tracktype_offs, image; |
|
1306 |
byte m5; |
|
1307 |
||
1308 |
_drawtile_track_palette = SPRITE_PALETTE(PLAYER_SPRITE_COLOR(_map_owner[ti->tile])); |
|
1309 |
||
1310 |
tracktype_offs = (_map3_lo[ti->tile] & 0xF) * TRACKTYPE_SPRITE_PITCH; |
|
1311 |
||
1312 |
m5 = (byte)ti->map5; |
|
1313 |
if (!(m5 & RAIL_TYPE_SPECIAL)) {
|
|
1314 |
bool special; |
|
1315 |
||
1316 |
m5 &= RAIL_BIT_MASK; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1317 |
|
| 0 | 1318 |
special = false; |
1319 |
||
1320 |
// select the sprite to use based on the map5 byte. |
|
1321 |
(image = 0x3F3, m5 == RAIL_BIT_DIAG2) || |
|
1322 |
(image++, m5 == RAIL_BIT_DIAG1) || |
|
1323 |
(image++, m5 == RAIL_BIT_UPPER) || |
|
1324 |
(image++, m5 == RAIL_BIT_LOWER) || |
|
1325 |
(image++, m5 == RAIL_BIT_RIGHT) || |
|
1326 |
(image++, m5 == RAIL_BIT_LEFT) || |
|
1327 |
(image++, m5 == (RAIL_BIT_DIAG1|RAIL_BIT_DIAG2)) || |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1328 |
|
| 0 | 1329 |
(image = 0x40B, m5 == (RAIL_BIT_UPPER|RAIL_BIT_LOWER)) || |
1330 |
(image++, m5 == (RAIL_BIT_LEFT|RAIL_BIT_RIGHT)) || |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1331 |
|
| 0 | 1332 |
(special=true, false) || |
1333 |
||
1334 |
(image = 0x3FA, !(m5 & (RAIL_BIT_RIGHT|RAIL_BIT_UPPER|RAIL_BIT_DIAG1))) || |
|
1335 |
(image++, !(m5 & (RAIL_BIT_LEFT|RAIL_BIT_LOWER|RAIL_BIT_DIAG1))) || |
|
1336 |
(image++, !(m5 & (RAIL_BIT_LEFT|RAIL_BIT_UPPER|RAIL_BIT_DIAG2))) || |
|
1337 |
(image++, !(m5 & (RAIL_BIT_RIGHT|RAIL_BIT_LOWER|RAIL_BIT_DIAG2))) || |
|
1338 |
(image++, true); |
|
1339 |
||
1340 |
if (ti->tileh != 0) {
|
|
1341 |
int f = GetRailFoundation(ti->tileh, ti->map5 & 0x3F); |
|
1342 |
if (f) DrawFoundation(ti, f); |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1343 |
|
| 0 | 1344 |
// default sloped sprites.. |
1345 |
if (ti->tileh != 0) image = _track_sloped_sprites[ti->tileh - 1] + 0x3F3; |
|
1346 |
} |
|
1347 |
||
1348 |
if ((_map2[ti->tile] & RAIL_MAP2LO_GROUND_MASK)==RAIL_GROUND_BROWN) |
|
1349 |
image = (image & 0xFFFF) | 0x3178000; // use a brown palette |
|
1350 |
else if ((_map2[ti->tile] & RAIL_MAP2LO_GROUND_MASK)==RAIL_GROUND_ICE_DESERT) |
|
1351 |
image += 26; |
|
1352 |
||
1353 |
DrawGroundSprite(image + tracktype_offs); |
|
1354 |
||
1355 |
if (special) {
|
|
1356 |
if (m5 & RAIL_BIT_DIAG1) DrawGroundSprite(0x3ED + tracktype_offs); |
|
1357 |
if (m5 & RAIL_BIT_DIAG2) DrawGroundSprite(0x3EE + tracktype_offs); |
|
1358 |
if (m5 & RAIL_BIT_UPPER) DrawGroundSprite(0x3EF + tracktype_offs); |
|
1359 |
if (m5 & RAIL_BIT_LOWER) DrawGroundSprite(0x3F0 + tracktype_offs); |
|
1360 |
if (m5 & RAIL_BIT_LEFT) DrawGroundSprite(0x3F2 + tracktype_offs); |
|
1361 |
if (m5 & RAIL_BIT_RIGHT) DrawGroundSprite(0x3F1 + tracktype_offs); |
|
1362 |
} |
|
1363 |
||
1364 |
if (_display_opt & DO_FULL_DETAIL) {
|
|
1365 |
_detailed_track_proc[_map2[ti->tile] & RAIL_MAP2LO_GROUND_MASK](ti); |
|
1366 |
} |
|
1367 |
||
1368 |
/* draw signals also? */ |
|
1369 |
if (!(ti->map5 & RAIL_TYPE_SIGNALS)) |
|
1370 |
return; |
|
1371 |
||
1372 |
{
|
|
1373 |
byte m23; |
|
1374 |
||
1375 |
m23 = (_map3_lo[ti->tile] >> 4) | (_map2[ti->tile] & 0xF0); |
|
1376 |
||
1377 |
#define HAS_SIGNAL(x) (m23 & (byte)(0x1 << (x))) |
|
1378 |
#define ISON_SIGNAL(x) (m23 & (byte)(0x10 << (x))) |
|
1379 |
#define MAYBE_DRAW_SIGNAL(x,y,z) if (HAS_SIGNAL(x)) DrawSignalHelper(ti, ISON_SIGNAL(x), ((y-0x4FB) << 4)|(z)) |
|
1380 |
||
1381 |
if (!(m5 & RAIL_BIT_DIAG2)) {
|
|
1382 |
if (!(m5 & RAIL_BIT_DIAG1)) {
|
|
1383 |
if (m5 & RAIL_BIT_LEFT) {
|
|
1384 |
MAYBE_DRAW_SIGNAL(2, 0x509, 0); |
|
1385 |
MAYBE_DRAW_SIGNAL(3, 0x507, 1); |
|
1386 |
} |
|
1387 |
if (m5 & RAIL_BIT_RIGHT) {
|
|
1388 |
MAYBE_DRAW_SIGNAL(0, 0x509, 2); |
|
1389 |
MAYBE_DRAW_SIGNAL(1, 0x507, 3); |
|
1390 |
} |
|
1391 |
if (m5 & RAIL_BIT_UPPER) {
|
|
1392 |
MAYBE_DRAW_SIGNAL(3, 0x505, 4); |
|
1393 |
MAYBE_DRAW_SIGNAL(2, 0x503, 5); |
|
1394 |
} |
|
1395 |
if (m5 & RAIL_BIT_LOWER) {
|
|
1396 |
MAYBE_DRAW_SIGNAL(1, 0x505, 6); |
|
1397 |
MAYBE_DRAW_SIGNAL(0, 0x503, 7); |
|
1398 |
} |
|
1399 |
} else {
|
|
1400 |
MAYBE_DRAW_SIGNAL(3, 0x4FB, 8); |
|
1401 |
MAYBE_DRAW_SIGNAL(2, 0x4FD, 9); |
|
1402 |
} |
|
1403 |
} else {
|
|
1404 |
MAYBE_DRAW_SIGNAL(3, 0x4FF, 10); |
|
1405 |
MAYBE_DRAW_SIGNAL(2, 0x501, 11); |
|
1406 |
} |
|
1407 |
} |
|
1408 |
} else {
|
|
|
395
4c990f33dab7
(svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky).
darkvater
parents:
393
diff
changeset
|
1409 |
/* draw depots / waypoints */ |
| 0 | 1410 |
const DrawTrackSeqStruct *drss; |
|
395
4c990f33dab7
(svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky).
darkvater
parents:
393
diff
changeset
|
1411 |
byte type = m5 & 0x3F; // 0-3: depots, 4-5: waypoints |
| 0 | 1412 |
|
1413 |
if (!(m5 & (RAIL_TYPE_MASK&~RAIL_TYPE_SPECIAL))) |
|
1414 |
return; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1415 |
|
| 0 | 1416 |
if (ti->tileh != 0) { DrawFoundation(ti, ti->tileh); }
|
1417 |
||
|
1535
a5f686a20d2c
(svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint
tron
parents:
1534
diff
changeset
|
1418 |
if (IsRailWaypoint(m5) && _map3_lo[ti->tile] & 16) {
|
|
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1419 |
// look for customization |
| 1477 | 1420 |
StationSpec *stat = GetCustomStation(STAT_CLASS_WAYP, _map3_hi[ti->tile]); |
|
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1421 |
|
|
403
bfb365c74e80
(svn r600) -newgrf: Relocation offset for custom station sprites is now stored separately, making it possible to show different sprites in waypoint selection dialog (pasky).
darkvater
parents:
399
diff
changeset
|
1422 |
if (stat) {
|
|
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1423 |
DrawTileSeqStruct const *seq; |
|
403
bfb365c74e80
(svn r600) -newgrf: Relocation offset for custom station sprites is now stored separately, making it possible to show different sprites in waypoint selection dialog (pasky).
darkvater
parents:
399
diff
changeset
|
1424 |
// emulate station tile - open with building |
|
bfb365c74e80
(svn r600) -newgrf: Relocation offset for custom station sprites is now stored separately, making it possible to show different sprites in waypoint selection dialog (pasky).
darkvater
parents:
399
diff
changeset
|
1425 |
DrawTileSprites *cust = &stat->renderdata[2 + (m5 & 0x1)]; |
|
413
36afcda97345
(svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky).
darkvater
parents:
412
diff
changeset
|
1426 |
uint32 relocation = GetCustomStationRelocation(stat, ComposeWaypointStation(ti->tile), 0); |
|
415
423de36034b8
(svn r612) [newgrf] Fix: custom waypoints on monorail/maglev are displayed correctly
dominik
parents:
413
diff
changeset
|
1427 |
int railtype=(_map3_lo[ti->tile] & 0xF); |
|
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1428 |
|
|
447
aaf1f59a8957
(svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky)
celestar
parents:
438
diff
changeset
|
1429 |
/* We don't touch the 0x8000 bit. In all this |
|
aaf1f59a8957
(svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky)
celestar
parents:
438
diff
changeset
|
1430 |
* waypoint code, it is used to indicate that |
|
aaf1f59a8957
(svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky)
celestar
parents:
438
diff
changeset
|
1431 |
* we should offset by railtype, but we always |
|
aaf1f59a8957
(svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky)
celestar
parents:
438
diff
changeset
|
1432 |
* do that for custom ground sprites and never |
|
aaf1f59a8957
(svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky)
celestar
parents:
438
diff
changeset
|
1433 |
* for station sprites. And in the drawing |
|
aaf1f59a8957
(svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky)
celestar
parents:
438
diff
changeset
|
1434 |
* code, it is used to indicate that the sprite |
|
aaf1f59a8957
(svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky)
celestar
parents:
438
diff
changeset
|
1435 |
* should be drawn in company colors, and it's |
|
aaf1f59a8957
(svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky)
celestar
parents:
438
diff
changeset
|
1436 |
* up to the GRF file to decide that. */ |
|
aaf1f59a8957
(svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky)
celestar
parents:
438
diff
changeset
|
1437 |
|
| 417 | 1438 |
image = cust->ground_sprite; |
1439 |
image += railtype*((image<_custom_sprites_base)?TRACKTYPE_SPRITE_PITCH:1); |
|
|
415
423de36034b8
(svn r612) [newgrf] Fix: custom waypoints on monorail/maglev are displayed correctly
dominik
parents:
413
diff
changeset
|
1440 |
|
|
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1441 |
DrawGroundSprite(image); |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1442 |
|
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1443 |
foreach_draw_tile_seq(seq, cust->seq) {
|
|
403
bfb365c74e80
(svn r600) -newgrf: Relocation offset for custom station sprites is now stored separately, making it possible to show different sprites in waypoint selection dialog (pasky).
darkvater
parents:
399
diff
changeset
|
1444 |
uint32 image = seq->image + relocation; |
|
447
aaf1f59a8957
(svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky)
celestar
parents:
438
diff
changeset
|
1445 |
DrawSpecialBuilding(image, 0, ti, |
|
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1446 |
seq->delta_x, seq->delta_y, seq->delta_z, |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1447 |
seq->width, seq->height, seq->unk); |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1448 |
} |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1449 |
return; |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1450 |
} |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1451 |
} |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1452 |
|
|
1399
4503bd2bfb82
(svn r1903) Replace some casts and macro magic with proper typing, similar to r1902
tron
parents:
1363
diff
changeset
|
1453 |
drss = _track_depot_layout_table[type]; |
| 0 | 1454 |
|
|
1399
4503bd2bfb82
(svn r1903) Replace some casts and macro magic with proper typing, similar to r1902
tron
parents:
1363
diff
changeset
|
1455 |
image = drss++->image; |
| 0 | 1456 |
if (image & 0x8000) image = (image & 0x7FFF) + tracktype_offs; |
1457 |
||
1458 |
// adjust ground tile for desert |
|
|
283
c1a99d78e5a3
(svn r289) Fix: Checkpoints on snow have correct ground now
dominik
parents:
282
diff
changeset
|
1459 |
// (don't adjust for arctic depots, because snow in depots looks weird) |
|
c1a99d78e5a3
(svn r289) Fix: Checkpoints on snow have correct ground now
dominik
parents:
282
diff
changeset
|
1460 |
if ((_map2[ti->tile] & RAIL_MAP2LO_GROUND_MASK)==RAIL_GROUND_ICE_DESERT && (_opt.landscape == LT_DESERT || type>=4)) |
| 0 | 1461 |
{
|
1462 |
if(image!=3981) |
|
1463 |
image += 26; // tile with tracks |
|
1464 |
else |
|
1465 |
image = 4550; // flat ground |
|
1466 |
} |
|
1467 |
||
1468 |
DrawGroundSprite(image); |
|
1469 |
||
1470 |
while ((image=drss->image) != 0) {
|
|
|
389
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1471 |
DrawSpecialBuilding(image, type < 4 ? tracktype_offs : 0, ti, |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1472 |
drss->subcoord_x, drss->subcoord_y, 0, |
|
2d394eeba5e5
(svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only
celestar
parents:
337
diff
changeset
|
1473 |
drss->width, drss->height, 0x17); |
| 0 | 1474 |
drss++; |
1475 |
} |
|
1476 |
} |
|
1477 |
} |
|
1478 |
||
1479 |
void DrawTrainDepotSprite(int x, int y, int image, int railtype) |
|
1480 |
{
|
|
1481 |
uint32 ormod, img; |
|
1482 |
const DrawTrackSeqStruct *dtss; |
|
1483 |
||
1484 |
/* baseimage */ |
|
1485 |
railtype *= TRACKTYPE_SPRITE_PITCH; |
|
1486 |
||
1487 |
ormod = PLAYER_SPRITE_COLOR(_local_player); |
|
1488 |
||
|
1399
4503bd2bfb82
(svn r1903) Replace some casts and macro magic with proper typing, similar to r1902
tron
parents:
1363
diff
changeset
|
1489 |
dtss = _track_depot_layout_table[image]; |
| 0 | 1490 |
|
1491 |
x+=33; |
|
1492 |
y+=17; |
|
1493 |
||
|
1399
4503bd2bfb82
(svn r1903) Replace some casts and macro magic with proper typing, similar to r1902
tron
parents:
1363
diff
changeset
|
1494 |
img = dtss++->image; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1495 |
if (img & 0x8000) img = (img & 0x7FFF) + railtype; |
| 0 | 1496 |
DrawSprite(img, x, y); |
1497 |
||
|
1399
4503bd2bfb82
(svn r1903) Replace some casts and macro magic with proper typing, similar to r1902
tron
parents:
1363
diff
changeset
|
1498 |
for (; dtss->image != 0; dtss++) {
|
| 0 | 1499 |
Point pt = RemapCoords(dtss->subcoord_x, dtss->subcoord_y, 0); |
1500 |
image = dtss->image; |
|
1501 |
if (image & 0x8000) image |= ormod; |
|
1502 |
DrawSprite(image + railtype, x + pt.x, y + pt.y); |
|
1503 |
} |
|
1504 |
} |
|
1505 |
||
1506 |
#define NUM_SSD_ENTRY 256 |
|
1507 |
#define NUM_SSD_STACK 32 |
|
1508 |
||
1509 |
typedef struct SetSignalsData {
|
|
1510 |
int cur; |
|
1511 |
int cur_stack; |
|
1512 |
bool stop; |
|
1513 |
bool has_presignal; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1514 |
|
| 0 | 1515 |
// presignal info |
1516 |
int presignal_exits; |
|
1517 |
int presignal_exits_free; |
|
1518 |
||
1519 |
// these are used to keep track of the signals that change. |
|
1520 |
byte bit[NUM_SSD_ENTRY]; |
|
1521 |
TileIndex tile[NUM_SSD_ENTRY]; |
|
1522 |
||
1523 |
// these are used to keep track of the stack that modifies presignals recursively |
|
1524 |
TileIndex next_tile[NUM_SSD_STACK]; |
|
1525 |
byte next_dir[NUM_SSD_STACK]; |
|
1526 |
||
1527 |
} SetSignalsData; |
|
1528 |
||
1529 |
static bool SetSignalsEnumProc(uint tile, SetSignalsData *ssd, int track, uint length, byte *state) |
|
1530 |
{
|
|
1531 |
// the tile has signals? |
|
|
1035
0a170deb6e33
(svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts
tron
parents:
1024
diff
changeset
|
1532 |
if (IsTileType(tile, MP_RAILWAY)) {
|
| 0 | 1533 |
if ((_map5[tile]&RAIL_TYPE_MASK) == RAIL_TYPE_SIGNALS) {
|
1534 |
if ((_map3_lo[tile] & _signals_table_both[track]) != 0) {
|
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1535 |
|
| 0 | 1536 |
// is the signal pointing in to the segment existing? |
1537 |
if ((_map3_lo[tile] & _signals_table[track]) != 0) {
|
|
1538 |
// yes, add the signal to the list of signals |
|
1539 |
if (ssd->cur != NUM_SSD_ENTRY) {
|
|
1540 |
ssd->tile[ssd->cur] = tile; // remember the tile index |
|
1541 |
ssd->bit[ssd->cur] = track; // and the controlling bit number |
|
1542 |
ssd->cur++; |
|
1543 |
} |
|
1544 |
||
1545 |
// remember if this block has a presignal. |
|
1546 |
ssd->has_presignal |= (_map3_hi[tile]&1); |
|
1547 |
} |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1548 |
|
| 0 | 1549 |
// is this an exit signal that points out from the segment? |
1550 |
if ((_map3_hi[tile]&2) && _map3_lo[tile]&_signals_table_other[track]) {
|
|
1551 |
ssd->presignal_exits++; |
|
1552 |
if ((_map2[tile]&_signals_table_other[track]) != 0) |
|
1553 |
ssd->presignal_exits_free++; |
|
1554 |
} |
|
1555 |
||
1556 |
return true; |
|
1557 |
} |
|
|
1535
a5f686a20d2c
(svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint
tron
parents:
1534
diff
changeset
|
1558 |
} else if (IsRailDepot(_map5[tile])) |
| 0 | 1559 |
return true; // don't look further if the tile is a depot |
1560 |
} |
|
1561 |
return false; |
|
1562 |
} |
|
1563 |
||
|
1555
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1564 |
/* Struct to parse data from VehicleFromPos to SignalVehicleCheckProc */ |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1565 |
typedef struct SignalVehicleCheckStruct {
|
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1566 |
TileIndex tile; |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1567 |
uint track; |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1568 |
} SignalVehicleCheckStruct; |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1569 |
|
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1570 |
static void *SignalVehicleCheckProc(Vehicle *v, void *data) |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1571 |
{
|
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1572 |
SignalVehicleCheckStruct *dest = data; |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1573 |
TileIndex tile; |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1574 |
|
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1575 |
/* Find the tile outside the tunnel, for signalling */ |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1576 |
if (v->u.rail.track == 0x40) {
|
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1577 |
tile = GetVehicleOutOfTunnelTile(v); |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1578 |
} else {
|
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1579 |
tile = v->tile; |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1580 |
} |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1581 |
|
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1582 |
/* Wrong tile, or no train? Not a match */ |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1583 |
if (tile != dest->tile || v->type != VEH_Train) |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1584 |
return NULL; |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1585 |
|
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1586 |
/* Are we on the same piece of track? */ |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1587 |
if (dest->track & (v->u.rail.track + (v->u.rail.track<<8))) |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1588 |
return v; |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1589 |
|
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1590 |
return NULL; |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1591 |
} |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1592 |
|
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1593 |
/* Special check for SetSignalsAfterProc, to see if there is a vehicle on this tile */ |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1594 |
bool SignalVehicleCheck(TileIndex tile, uint track) |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1595 |
{
|
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1596 |
SignalVehicleCheckStruct dest; |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1597 |
|
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1598 |
dest.tile = tile; |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1599 |
dest.track = track; |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1600 |
|
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1601 |
return VehicleFromPos(tile, &dest, SignalVehicleCheckProc) != NULL; |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1602 |
} |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1603 |
|
| 0 | 1604 |
static void SetSignalsAfterProc(TrackPathFinder *tpf) |
1605 |
{
|
|
1606 |
SetSignalsData *ssd = tpf->userdata; |
|
1607 |
TrackPathFinderLink *link; |
|
|
1555
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1608 |
uint offs; |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1609 |
uint i; |
| 0 | 1610 |
|
1611 |
ssd->stop = false; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1612 |
|
|
1555
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1613 |
/* Go through all the PF tiles */ |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1614 |
for (i = 0; i < lengthof(tpf->hash_head); i++) {
|
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1615 |
/* Empty hash item */ |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1616 |
if (tpf->hash_head[i] == 0) |
| 0 | 1617 |
continue; |
1618 |
||
|
1555
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1619 |
/* If 0x8000 is not set, there is only 1 item */ |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1620 |
if (!(tpf->hash_head[i] & 0x8000)) {
|
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1621 |
/* Check if there is a vehicle on this tile */ |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1622 |
if (SignalVehicleCheck(tpf->hash_tile[i], tpf->hash_head[i])) {
|
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1623 |
ssd->stop = true; |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1624 |
return; |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1625 |
} |
| 0 | 1626 |
} else {
|
|
1555
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1627 |
/* There are multiple items, where hash_tile points to the first item in the list */ |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1628 |
offs = tpf->hash_tile[i]; |
| 0 | 1629 |
do {
|
|
1555
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1630 |
/* Find the next item */ |
| 0 | 1631 |
link = PATHFIND_GET_LINK_PTR(tpf, offs); |
|
1555
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1632 |
/* Check if there is a vehicle on this tile */ |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1633 |
if (SignalVehicleCheck(link->tile, link->flags)) {
|
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1634 |
ssd->stop = true; |
|
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1635 |
return; |
| 0 | 1636 |
} |
|
1555
c7e5bb32f536
(svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF
truelight
parents:
1542
diff
changeset
|
1637 |
/* Goto the next item */ |
| 0 | 1638 |
} while ((offs=link->next) != 0xFFFF); |
1639 |
} |
|
1640 |
} |
|
1641 |
} |
|
1642 |
||
1643 |
static const byte _dir_from_track[14] = {
|
|
1644 |
0,1,0,1,2,1, 0,0, |
|
1645 |
2,3,3,2,3,0, |
|
1646 |
}; |
|
1647 |
||
1648 |
||
1649 |
static void ChangeSignalStates(SetSignalsData *ssd) |
|
1650 |
{
|
|
1651 |
int i; |
|
1652 |
||
1653 |
// thinking about presignals... |
|
1654 |
// the presignal is green if, |
|
1655 |
// if no train is in the segment AND |
|
1656 |
// there is at least one green exit signal OR |
|
1657 |
// there are no exit signals in the segment |
|
1658 |
||
1659 |
// then mark the signals in the segment accordingly |
|
1660 |
for(i=0; i!=ssd->cur; i++) {
|
|
1661 |
uint tile = ssd->tile[i]; |
|
1662 |
byte bit = _signals_table[ssd->bit[i]]; |
|
|
817
4f9377b7fd2b
(svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as
truelight
parents:
679
diff
changeset
|
1663 |
uint16 m2 = _map2[tile]; |
| 0 | 1664 |
|
1665 |
// presignals don't turn green if there is at least one presignal exit and none are free |
|
1666 |
if (_map3_hi[tile] & 1) {
|
|
1667 |
int ex = ssd->presignal_exits, exfree = ssd->presignal_exits_free; |
|
1668 |
||
1669 |
// subtract for dual combo signals so they don't count themselves |
|
1670 |
if (_map3_hi[tile]&2 && _map3_lo[tile]&_signals_table_other[ssd->bit[i]]) {
|
|
1671 |
ex--; |
|
1672 |
if ((_map2[tile]&_signals_table_other[ssd->bit[i]]) != 0) exfree--; |
|
1673 |
} |
|
1674 |
||
1675 |
// if we have exits and none are free, make red. |
|
1676 |
if (ex && !exfree) goto make_red; |
|
1677 |
} |
|
1678 |
||
1679 |
// check if the signal is unaffected. |
|
1680 |
if (ssd->stop) {
|
|
1681 |
make_red: |
|
1682 |
// turn red |
|
1683 |
if ( (bit&m2) == 0 ) |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1684 |
continue; |
| 0 | 1685 |
} else {
|
1686 |
// turn green |
|
1687 |
if ( (bit&m2) != 0 ) |
|
1688 |
continue; |
|
1689 |
} |
|
1690 |
||
1691 |
// Update signals on the other side of this exit signal, it changed. |
|
1692 |
// If this segment has presignals, then we treat exit signals going into the segment as normal signals. |
|
1693 |
if (_map3_hi[tile]&2 && (_map3_hi[tile]&1 || !ssd->has_presignal)) {
|
|
1694 |
if (ssd->cur_stack != NUM_SSD_STACK) {
|
|
1695 |
ssd->next_tile[ssd->cur_stack] = tile; |
|
1696 |
ssd->next_dir[ssd->cur_stack] = _dir_from_track[ssd->bit[i]]; |
|
1697 |
ssd->cur_stack++; |
|
1698 |
} else {
|
|
1699 |
printf("NUM_SSD_STACK too small\n");
|
|
1700 |
} |
|
1701 |
} |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1702 |
|
| 0 | 1703 |
// it changed, so toggle it |
1704 |
_map2[tile] = m2 ^ bit; |
|
1705 |
MarkTileDirtyByTile(tile); |
|
1706 |
} |
|
1707 |
} |
|
1708 |
||
1709 |
||
1710 |
bool UpdateSignalsOnSegment(uint tile, byte direction) |
|
1711 |
{
|
|
1712 |
SetSignalsData ssd; |
|
1713 |
int result = -1; |
|
1714 |
||
1715 |
ssd.cur_stack = 0; |
|
1716 |
direction>>=1; |
|
1717 |
||
1718 |
for(;;) {
|
|
1719 |
// go through one segment and update all signals pointing into that segment. |
|
1720 |
ssd.cur = ssd.presignal_exits = ssd.presignal_exits_free = 0; |
|
1721 |
ssd.has_presignal = false; |
|
1722 |
||
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
149
diff
changeset
|
1723 |
FollowTrack(tile, 0xC000 | TRANSPORT_RAIL, direction, (TPFEnumProc*)SetSignalsEnumProc, SetSignalsAfterProc, &ssd); |
| 0 | 1724 |
ChangeSignalStates(&ssd); |
1725 |
||
1726 |
// remember the result only for the first iteration. |
|
1727 |
if (result < 0) result = ssd.stop; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1728 |
|
| 0 | 1729 |
// if any exit signals were changed, we need to keep going to modify the stuff behind those. |
1730 |
if(!ssd.cur_stack) |
|
1731 |
break; |
|
1732 |
||
1733 |
// one or more exit signals were changed, so we need to update another segment too. |
|
1734 |
tile = ssd.next_tile[--ssd.cur_stack]; |
|
1735 |
direction = ssd.next_dir[ssd.cur_stack]; |
|
1736 |
} |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1737 |
|
| 0 | 1738 |
return (bool)result; |
1739 |
} |
|
1740 |
||
1741 |
void SetSignalsOnBothDir(uint tile, byte track) |
|
1742 |
{
|
|
1743 |
static const byte _search_dir_1[6] = {1, 3, 1, 3, 5, 3};
|
|
1744 |
static const byte _search_dir_2[6] = {5, 7, 7, 5, 7, 1};
|
|
1745 |
||
1746 |
UpdateSignalsOnSegment(tile, _search_dir_1[track]); |
|
1747 |
UpdateSignalsOnSegment(tile, _search_dir_2[track]); |
|
1748 |
} |
|
1749 |
||
| 410 | 1750 |
static uint GetSlopeZ_Track(TileInfo *ti) |
| 0 | 1751 |
{
|
1752 |
uint z = ti->z; |
|
1753 |
int th = ti->tileh; |
|
|
13
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
1754 |
|
| 0 | 1755 |
// check if it's a foundation |
1756 |
if (ti->tileh != 0) {
|
|
1757 |
if ((ti->map5 & 0x80) == 0) {
|
|
1758 |
uint f = GetRailFoundation(ti->tileh, ti->map5 & 0x3F); |
|
1759 |
if (f != 0) {
|
|
1760 |
if (f < 15) {
|
|
1761 |
// leveled foundation |
|
1762 |
return z + 8; |
|
1763 |
} |
|
1764 |
// inclined foundation |
|
1765 |
th = _inclined_tileh[f - 15]; |
|
1766 |
} |
|
1767 |
} else if ((ti->map5 & 0xC0) == 0xC0) {
|
|
|
395
4c990f33dab7
(svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky).
darkvater
parents:
393
diff
changeset
|
1768 |
// depot or waypoint |
| 0 | 1769 |
return z + 8; |
1770 |
} |
|
1771 |
return GetPartialZ(ti->x&0xF, ti->y&0xF, th) + z; |
|
1772 |
} |
|
1773 |
return z; |
|
1774 |
} |
|
1775 |
||
| 1095 | 1776 |
static uint GetSlopeTileh_Track(TileInfo *ti) |
| 39 | 1777 |
{
|
1778 |
// check if it's a foundation |
|
1779 |
if (ti->tileh != 0) {
|
|
1780 |
if ((ti->map5 & 0x80) == 0) {
|
|
1781 |
uint f = GetRailFoundation(ti->tileh, ti->map5 & 0x3F); |
|
1782 |
if (f != 0) {
|
|
1783 |
if (f < 15) {
|
|
1784 |
// leveled foundation |
|
1785 |
return 0; |
|
1786 |
} |
|
1787 |
// inclined foundation |
|
1788 |
return _inclined_tileh[f - 15]; |
|
1789 |
} |
|
1790 |
} else if ((ti->map5 & 0xC0) == 0xC0) {
|
|
|
395
4c990f33dab7
(svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky).
darkvater
parents:
393
diff
changeset
|
1791 |
// depot or waypoint |
| 39 | 1792 |
return 0; |
1793 |
} |
|
1794 |
} |
|
1795 |
return ti->tileh; |
|
1796 |
} |
|
1797 |
||
|
473
0da86c59e3ae
(svn r724) Remove restriction that a tile can only accept 3 cargo types.
tron
parents:
447
diff
changeset
|
1798 |
static void GetAcceptedCargo_Track(uint tile, AcceptedCargo ac) |
| 0 | 1799 |
{
|
1800 |
/* not used */ |
|
1801 |
} |
|
1802 |
||
1803 |
static void AnimateTile_Track(uint tile) |
|
1804 |
{
|
|
1805 |
/* not used */ |
|
1806 |
} |
|
1807 |
||
1808 |
static void TileLoop_Track(uint tile) |
|
1809 |
{
|
|
1810 |
byte a2; |
|
1811 |
byte rail; |
|
|
817
4f9377b7fd2b
(svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as
truelight
parents:
679
diff
changeset
|
1812 |
uint16 m2; |
| 0 | 1813 |
byte owner; |
1814 |
||
1815 |
m2 = _map2[tile] & 0xF; |
|
1816 |
||
1817 |
/* special code for alps landscape */ |
|
1818 |
if (_opt.landscape == LT_HILLY) {
|
|
1819 |
/* convert into snow? */ |
|
1820 |
if (GetTileZ(tile) > _opt.snow_line) {
|
|
1821 |
a2 = RAIL_GROUND_ICE_DESERT; |
|
1822 |
goto modify_me; |
|
1823 |
} |
|
1824 |
||
1825 |
/* special code for desert landscape */ |
|
1826 |
} else if (_opt.landscape == LT_DESERT) {
|
|
1827 |
/* convert into desert? */ |
|
1828 |
if (GetMapExtraBits(tile) == 1) {
|
|
1829 |
a2 = RAIL_GROUND_ICE_DESERT; |
|
1830 |
goto modify_me; |
|
1831 |
} |
|
1832 |
} |
|
1833 |
||
1834 |
// Don't continue tile loop for depots |
|
1835 |
if (_map5[tile] & RAIL_TYPE_SPECIAL) |
|
1836 |
return; |
|
1837 |
||
1838 |
a2 = RAIL_GROUND_GREEN; |
|
1839 |
||
1840 |
if (m2 != RAIL_GROUND_BROWN) { /* wait until bottom is green */
|
|
1841 |
/* determine direction of fence */ |
|
1842 |
rail = _map5[tile] & RAIL_BIT_MASK; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1843 |
|
| 0 | 1844 |
if (rail == RAIL_BIT_UPPER) {
|
1845 |
a2 = RAIL_GROUND_FENCE_HORIZ1; |
|
1846 |
} else if (rail == RAIL_BIT_LOWER) {
|
|
1847 |
a2 = RAIL_GROUND_FENCE_HORIZ2; |
|
1848 |
} else if (rail == RAIL_BIT_LEFT) {
|
|
1849 |
a2 = RAIL_GROUND_FENCE_VERT1; |
|
1850 |
} else if (rail == RAIL_BIT_RIGHT) {
|
|
1851 |
a2 = RAIL_GROUND_FENCE_VERT2; |
|
1852 |
} else {
|
|
1853 |
owner = _map_owner[tile]; |
|
1854 |
||
1855 |
if ( (!(rail&(RAIL_BIT_DIAG2|RAIL_BIT_UPPER|RAIL_BIT_LEFT)) && (rail&RAIL_BIT_DIAG1)) || rail==(RAIL_BIT_LOWER|RAIL_BIT_RIGHT)) {
|
|
|
1035
0a170deb6e33
(svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts
tron
parents:
1024
diff
changeset
|
1856 |
if (!IsTileType(tile + TILE_XY(0,-1), MP_RAILWAY) || |
| 0 | 1857 |
owner != _map_owner[tile + TILE_XY(0,-1)] || |
1858 |
(_map5[tile + TILE_XY(0,-1)]==RAIL_BIT_UPPER || _map5[tile + TILE_XY(0,-1)]==RAIL_BIT_LEFT)) |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1859 |
a2 = RAIL_GROUND_FENCE_NW; |
| 0 | 1860 |
} |
1861 |
||
1862 |
if ( (!(rail&(RAIL_BIT_DIAG2|RAIL_BIT_LOWER|RAIL_BIT_RIGHT)) && (rail&RAIL_BIT_DIAG1)) || rail==(RAIL_BIT_UPPER|RAIL_BIT_LEFT)) {
|
|
|
1035
0a170deb6e33
(svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts
tron
parents:
1024
diff
changeset
|
1863 |
if (!IsTileType(tile + TILE_XY(0,1), MP_RAILWAY) || |
| 0 | 1864 |
owner != _map_owner[tile + TILE_XY(0,1)] || |
1865 |
(_map5[tile + TILE_XY(0,1)]==RAIL_BIT_LOWER || _map5[tile + TILE_XY(0,1)]==RAIL_BIT_RIGHT)) |
|
1866 |
a2 = (a2 == RAIL_GROUND_FENCE_NW) ? RAIL_GROUND_FENCE_SENW : RAIL_GROUND_FENCE_SE; |
|
1867 |
} |
|
1868 |
||
1869 |
if ( (!(rail&(RAIL_BIT_DIAG1|RAIL_BIT_UPPER|RAIL_BIT_RIGHT)) && (rail&RAIL_BIT_DIAG2)) || rail==(RAIL_BIT_LOWER|RAIL_BIT_LEFT)) {
|
|
|
1035
0a170deb6e33
(svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts
tron
parents:
1024
diff
changeset
|
1870 |
if (!IsTileType(tile + TILE_XY(-1,0), MP_RAILWAY) || |
| 0 | 1871 |
owner != _map_owner[tile + TILE_XY(-1,0)] || |
1872 |
(_map5[tile + TILE_XY(-1,0)]==RAIL_BIT_UPPER || _map5[tile + TILE_XY(-1,0)]==RAIL_BIT_RIGHT)) |
|
1873 |
a2 = RAIL_GROUND_FENCE_NE; |
|
1874 |
} |
|
1875 |
||
1876 |
if ( (!(rail&(RAIL_BIT_DIAG1|RAIL_BIT_LOWER|RAIL_BIT_LEFT)) && (rail&RAIL_BIT_DIAG2)) || rail==(RAIL_BIT_UPPER|RAIL_BIT_RIGHT)) {
|
|
|
1035
0a170deb6e33
(svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts
tron
parents:
1024
diff
changeset
|
1877 |
if (!IsTileType(tile + TILE_XY(1,0), MP_RAILWAY) || |
| 0 | 1878 |
owner != _map_owner[tile + TILE_XY(1,0)] || |
1879 |
(_map5[tile + TILE_XY(1,0)]==RAIL_BIT_LOWER || _map5[tile + TILE_XY(1,0)]==RAIL_BIT_LEFT)) |
|
1880 |
a2 = (a2 == RAIL_GROUND_FENCE_NE) ? RAIL_GROUND_FENCE_NESW : RAIL_GROUND_FENCE_SW; |
|
1881 |
} |
|
1882 |
} |
|
1883 |
} |
|
1884 |
||
1885 |
modify_me:; |
|
1886 |
/* tile changed? */ |
|
1887 |
if ( m2 != a2) {
|
|
1888 |
_map2[tile] = (_map2[tile] & ~RAIL_MAP2LO_GROUND_MASK) | a2; |
|
1889 |
MarkTileDirtyByTile(tile); |
|
1890 |
} |
|
1891 |
} |
|
1892 |
||
1893 |
||
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
149
diff
changeset
|
1894 |
static uint32 GetTileTrackStatus_Track(uint tile, TransportType mode) {
|
|
817
4f9377b7fd2b
(svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as
truelight
parents:
679
diff
changeset
|
1895 |
byte m5, a; |
|
4f9377b7fd2b
(svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as
truelight
parents:
679
diff
changeset
|
1896 |
uint16 b; |
| 0 | 1897 |
uint32 ret; |
1898 |
||
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
149
diff
changeset
|
1899 |
if (mode != TRANSPORT_RAIL) |
| 0 | 1900 |
return 0; |
1901 |
||
1902 |
m5 = _map5[tile]; |
|
1903 |
||
1904 |
if (!(m5 & RAIL_TYPE_SPECIAL)) {
|
|
1905 |
ret = (m5 | (m5 << 8)) & 0x3F3F; |
|
1906 |
if (!(m5 & RAIL_TYPE_SIGNALS)) {
|
|
1907 |
if ( (ret & 0xFF) == 3) |
|
| 22 | 1908 |
/* Diagonal crossing? */ |
| 0 | 1909 |
ret |= 0x40; |
1910 |
} else {
|
|
1911 |
/* has_signals */ |
|
1912 |
||
1913 |
a = _map3_lo[tile]; |
|
1914 |
b = _map2[tile]; |
|
1915 |
||
1916 |
b &= a; |
|
1917 |
||
| 22 | 1918 |
/* When signals are not present (in neither |
1919 |
* direction), we pretend them to be green. (So if |
|
1920 |
* signals are only one way, the other way will |
|
1921 |
* implicitely become `red' */ |
|
| 0 | 1922 |
if ((a & 0xC0) == 0) { b |= 0xC0; }
|
1923 |
if ((a & 0x30) == 0) { b |= 0x30; }
|
|
1924 |
||
1925 |
if ( (b & 0x80) == 0) ret |= 0x10070000; |
|
1926 |
if ( (b & 0x40) == 0) ret |= 0x7100000; |
|
1927 |
if ( (b & 0x20) == 0) ret |= 0x20080000; |
|
1928 |
if ( (b & 0x10) == 0) ret |= 0x8200000; |
|
1929 |
} |
|
1930 |
} else if (m5 & 0x40) {
|
|
1931 |
static const byte _train_spec_tracks[6] = {1,2,1,2,1,2};
|
|
1932 |
m5 = _train_spec_tracks[m5 & 0x3F]; |
|
1933 |
ret = (m5 << 8) + m5; |
|
1934 |
} else |
|
1935 |
return 0; |
|
1936 |
return ret; |
|
1937 |
} |
|
1938 |
||
1939 |
static void ClickTile_Track(uint tile) |
|
1940 |
{
|
|
|
1535
a5f686a20d2c
(svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint
tron
parents:
1534
diff
changeset
|
1941 |
if (IsRailDepot(_map5[tile])) |
| 0 | 1942 |
ShowTrainDepotWindow(tile); |
|
1535
a5f686a20d2c
(svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint
tron
parents:
1534
diff
changeset
|
1943 |
else if (IsRailWaypoint(_map5[tile])) |
|
1542
2ca6d1624e6d
(svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h
truelight
parents:
1536
diff
changeset
|
1944 |
ShowRenameWaypointWindow(GetWaypointByTile(tile)); |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1945 |
|
| 0 | 1946 |
} |
1947 |
||
|
1590
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1948 |
static void GetTileDesc_Track(TileIndex tile, TileDesc *td) |
| 0 | 1949 |
{
|
|
1590
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1950 |
td->owner = _map_owner[tile]; |
|
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1951 |
switch (_map5[tile] & RAIL_TYPE_MASK) {
|
|
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1952 |
case RAIL_TYPE_NORMAL: |
| 0 | 1953 |
td->str = STR_1021_RAILROAD_TRACK; |
|
1590
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1954 |
break; |
|
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1955 |
|
|
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1956 |
case RAIL_TYPE_SIGNALS: {
|
|
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1957 |
const StringID signal_type[] = {
|
|
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1958 |
STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS, |
|
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1959 |
STR_RAILROAD_TRACK_WITH_PRESIGNALS, |
|
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1960 |
STR_RAILROAD_TRACK_WITH_EXITSIGNALS, |
|
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1961 |
STR_RAILROAD_TRACK_WITH_COMBOSIGNALS |
|
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1962 |
}; |
|
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1963 |
|
|
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1964 |
td->str = signal_type[_map3_hi[tile] & 0x03]; |
|
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1965 |
break; |
| 0 | 1966 |
} |
|
1590
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1967 |
|
|
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1968 |
case RAIL_TYPE_DEPOT: |
|
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1969 |
default: |
|
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1970 |
td->str = ((_map5[tile] & RAIL_SUBTYPE_MASK) == RAIL_SUBTYPE_DEPOT) ? |
|
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1971 |
STR_1023_RAILROAD_TRAIN_DEPOT : STR_LANDINFO_WAYPOINT; |
|
4e39d1da10c7
(svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch
tron
parents:
1555
diff
changeset
|
1972 |
break; |
| 0 | 1973 |
} |
1974 |
} |
|
1975 |
||
1976 |
static void ChangeTileOwner_Track(uint tile, byte old_player, byte new_player) |
|
1977 |
{
|
|
1978 |
if (_map_owner[tile] != old_player) |
|
1979 |
return; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1980 |
|
| 0 | 1981 |
if (new_player != 255) {
|
1982 |
_map_owner[tile] = new_player; |
|
1983 |
} else {
|
|
1984 |
DoCommandByTile(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR); |
|
1985 |
} |
|
1986 |
} |
|
1987 |
||
1988 |
static const byte _fractcoords_behind[4] = { 0x8F, 0x8, 0x80, 0xF8 };
|
|
1989 |
static const byte _fractcoords_enter[4] = { 0x8A, 0x48, 0x84, 0xA8 };
|
|
1990 |
static const byte _fractcoords_leave[4] = { 0x81, 0xD8, 0x8D, 0x18 };
|
|
1991 |
static const byte _enter_directions[4] = {5, 7, 1, 3};
|
|
1992 |
static const byte _leave_directions[4] = {1, 3, 5, 7};
|
|
1993 |
static const byte _depot_track_mask[4] = {1, 2, 1, 2};
|
|
1994 |
||
| 410 | 1995 |
static uint32 VehicleEnter_Track(Vehicle *v, uint tile, int x, int y) |
| 0 | 1996 |
{
|
1997 |
byte fract_coord; |
|
1998 |
int dir; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1999 |
|
| 0 | 2000 |
// this routine applies only to trains in depot tiles |
|
1535
a5f686a20d2c
(svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint
tron
parents:
1534
diff
changeset
|
2001 |
if (v->type != VEH_Train || !IsRailDepot(_map5[tile])) |
| 0 | 2002 |
return 0; |
2003 |
||
2004 |
/* depot direction */ |
|
2005 |
dir = _map5[tile] & RAIL_DEPOT_DIR; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
2006 |
|
| 0 | 2007 |
fract_coord = (x & 0xF) + ((y & 0xF) << 4); |
2008 |
if (_fractcoords_behind[dir] == fract_coord) {
|
|
2009 |
/* make sure a train is not entering the tile from behind */ |
|
2010 |
return 8; |
|
2011 |
} else if (_fractcoords_enter[dir] == fract_coord) {
|
|
2012 |
if (_enter_directions[dir] == v->direction) {
|
|
2013 |
/* enter the depot */ |
|
2014 |
v->u.rail.track = 0x80, |
|
2015 |
v->vehstatus |= VS_HIDDEN; /* hide it */ |
|
2016 |
v->direction ^= 4; |
|
2017 |
if (v->next == NULL) |
|
2018 |
TrainEnterDepot(v, tile); |
|
2019 |
v->tile = tile; |
|
2020 |
InvalidateWindow(WC_VEHICLE_DEPOT, tile); |
|
2021 |
return 4; |
|
2022 |
} |
|
2023 |
} else if (_fractcoords_leave[dir] == fract_coord) {
|
|
2024 |
if (_leave_directions[dir] == v->direction) {
|
|
2025 |
/* leave the depot? */ |
|
2026 |
if ((v=v->next) != NULL) {
|
|
2027 |
v->vehstatus &= ~VS_HIDDEN; |
|
2028 |
v->u.rail.track = _depot_track_mask[dir]; |
|
|
1330
8a67d04016ce
(svn r1834) - Fix: NPF does not check the owner of its target, busses try to enter other players' depots. TODO
matthijs
parents:
1328
diff
changeset
|
2029 |
assert(v->u.rail.track); |
| 0 | 2030 |
} |
2031 |
} |
|
2032 |
} |
|
2033 |
||
2034 |
return 0; |
|
2035 |
} |
|
2036 |
||
|
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1084
diff
changeset
|
2037 |
void InitializeRail(void) |
| 0 | 2038 |
{
|
2039 |
_last_built_train_depot_tile = 0; |
|
2040 |
} |
|
2041 |
||
2042 |
const TileTypeProcs _tile_type_rail_procs = {
|
|
2043 |
DrawTile_Track, /* draw_tile_proc */ |
|
2044 |
GetSlopeZ_Track, /* get_slope_z_proc */ |
|
2045 |
ClearTile_Track, /* clear_tile_proc */ |
|
2046 |
GetAcceptedCargo_Track, /* get_accepted_cargo_proc */ |
|
2047 |
GetTileDesc_Track, /* get_tile_desc_proc */ |
|
2048 |
GetTileTrackStatus_Track, /* get_tile_track_status_proc */ |
|
2049 |
ClickTile_Track, /* click_tile_proc */ |
|
2050 |
AnimateTile_Track, /* animate_tile_proc */ |
|
2051 |
TileLoop_Track, /* tile_loop_clear */ |
|
2052 |
ChangeTileOwner_Track, /* change_tile_owner_clear */ |
|
2053 |
NULL, /* get_produced_cargo_proc */ |
|
2054 |
VehicleEnter_Track, /* vehicle_enter_tile_proc */ |
|
2055 |
NULL, /* vehicle_leave_tile_proc */ |
|
| 39 | 2056 |
GetSlopeTileh_Track, /* get_slope_tileh_proc */ |
| 0 | 2057 |
}; |