author | rubidium |
Tue, 18 Dec 2007 20:58:12 +0000 | |
changeset 8103 | cf92483a0abf |
parent 8088 | 92fca5b09665 |
child 8108 | b42a0e5c67ef |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
3 |
/** @file pathfind.cpp */ |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
4 |
|
0 | 5 |
#include "stdafx.h" |
1891
862800791170
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1209
diff
changeset
|
6 |
#include "openttd.h" |
3234
a2791a480b71
(svn r3907) Replace many bridge related direct map accesses with calls to shiny new functions and mark some strange constructs with XXX
tron
parents:
3184
diff
changeset
|
7 |
#include "bridge_map.h" |
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3894
diff
changeset
|
8 |
#include "station_map.h" |
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3894
diff
changeset
|
9 |
#include "depot.h" |
2163
b17b313113a0
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2153
diff
changeset
|
10 |
#include "functions.h" |
6453
226bcddeba32
(svn r9609) -Codechange: Move some function prototypes out of functions.h and into landscape.h, and add a few where they didn't exist.
maedhros
parents:
6352
diff
changeset
|
11 |
#include "landscape.h" |
679
04ca2cd69420
(svn r1117) Move map arrays and some related macros into their own files map.c and map.h
tron
parents:
536
diff
changeset
|
12 |
#include "map.h" |
1209
2e00193652b2
(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:
1035
diff
changeset
|
13 |
#include "tile.h" |
0 | 14 |
#include "pathfind.h" |
8103
cf92483a0abf
(svn r11664) -Codechange: use more specific ("rail_type.h" instead of "rail.h" that includes way more than only "rail_type.h") includes at some places.
rubidium
parents:
8088
diff
changeset
|
15 |
#include "rail_type.h" |
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
16 |
#include "debug.h" |
3154 | 17 |
#include "tunnel_map.h" |
2153
ecfc674410b4
(svn r2663) Include variables.h only in these files which need it, not globally via openttd.h
tron
parents:
2137
diff
changeset
|
18 |
#include "variables.h" |
3735
76dacda0b4da
(svn r4715) - Fix: (FS#109) ? Wrongfully bad signal - Don't allow OPF to enter train depot from the back
KUDr
parents:
3618
diff
changeset
|
19 |
#include "depot.h" |
8083
ad22eade501f
(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h
smatz
parents:
7971
diff
changeset
|
20 |
#include "tunnelbridge_map.h" |
0 | 21 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
22 |
/* remember which tiles we have already visited so we don't visit them again. */ |
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1901
diff
changeset
|
23 |
static bool TPFSetTileBit(TrackPathFinder *tpf, TileIndex tile, int dir) |
0 | 24 |
{ |
25 |
uint hash, val, offs; |
|
26 |
TrackPathFinderLink *link, *new_link; |
|
27 |
uint bits = 1 << dir; |
|
28 |
||
29 |
if (tpf->disable_tile_hash) |
|
30 |
return true; |
|
31 |
||
32 |
hash = PATHFIND_HASH_TILE(tile); |
|
33 |
||
34 |
val = tpf->hash_head[hash]; |
|
35 |
||
36 |
if (val == 0) { |
|
37 |
/* unused hash entry, set the appropriate bit in it and return true |
|
38 |
* to indicate that a bit was set. */ |
|
39 |
tpf->hash_head[hash] = bits; |
|
1986
fcc849a38ae6
(svn r2492) Remove some pointless casts and fix some nearby indentation
tron
parents:
1980
diff
changeset
|
40 |
tpf->hash_tile[hash] = tile; |
0 | 41 |
return true; |
42 |
} else if (!(val & 0x8000)) { |
|
43 |
/* single tile */ |
|
44 |
||
1986
fcc849a38ae6
(svn r2492) Remove some pointless casts and fix some nearby indentation
tron
parents:
1980
diff
changeset
|
45 |
if (tile == tpf->hash_tile[hash]) { |
0 | 46 |
/* found another bit for the same tile, |
47 |
* check if this bit is already set, if so, return false */ |
|
48 |
if (val & bits) |
|
49 |
return false; |
|
50 |
||
51 |
/* otherwise set the bit and return true to indicate that the bit |
|
52 |
* was set */ |
|
53 |
tpf->hash_head[hash] = val | bits; |
|
54 |
return true; |
|
55 |
} else { |
|
56 |
/* two tiles with the same hash, need to make a link */ |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
57 |
|
0 | 58 |
/* allocate a link. if out of links, handle this by returning |
59 |
* that a tile was already visisted. */ |
|
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
60 |
if (tpf->num_links_left == 0) { |
0 | 61 |
return false; |
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
62 |
} |
0 | 63 |
tpf->num_links_left--; |
64 |
link = tpf->new_link++; |
|
65 |
||
66 |
/* move the data that was previously in the hash_??? variables |
|
67 |
* to the link struct, and let the hash variables point to the link */ |
|
68 |
link->tile = tpf->hash_tile[hash]; |
|
69 |
tpf->hash_tile[hash] = PATHFIND_GET_LINK_OFFS(tpf, link); |
|
70 |
||
71 |
link->flags = tpf->hash_head[hash]; |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
72 |
tpf->hash_head[hash] = 0xFFFF; // multi link |
0 | 73 |
|
74 |
link->next = 0xFFFF; |
|
75 |
} |
|
76 |
} else { |
|
77 |
/* a linked list of many tiles, |
|
78 |
* find the one corresponding to the tile, if it exists. |
|
79 |
* otherwise make a new link */ |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
80 |
|
0 | 81 |
offs = tpf->hash_tile[hash]; |
82 |
do { |
|
83 |
link = PATHFIND_GET_LINK_PTR(tpf, offs); |
|
1986
fcc849a38ae6
(svn r2492) Remove some pointless casts and fix some nearby indentation
tron
parents:
1980
diff
changeset
|
84 |
if (tile == link->tile) { |
0 | 85 |
/* found the tile in the link list, |
86 |
* check if the bit was alrady set, if so return false to indicate that the |
|
87 |
* bit was already set */ |
|
88 |
if (link->flags & bits) |
|
89 |
return false; |
|
90 |
link->flags |= bits; |
|
91 |
return true; |
|
92 |
} |
|
93 |
} while ((offs=link->next) != 0xFFFF); |
|
94 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
95 |
|
0 | 96 |
/* get here if we need to add a new link to link, |
97 |
* first, allocate a new link, in the same way as before */ |
|
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
98 |
if (tpf->num_links_left == 0) { |
0 | 99 |
return false; |
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
100 |
} |
0 | 101 |
tpf->num_links_left--; |
102 |
new_link = tpf->new_link++; |
|
103 |
||
104 |
/* then fill the link with the new info, and establish a ptr from the old |
|
105 |
* link to the new one */ |
|
1986
fcc849a38ae6
(svn r2492) Remove some pointless casts and fix some nearby indentation
tron
parents:
1980
diff
changeset
|
106 |
new_link->tile = tile; |
0 | 107 |
new_link->flags = bits; |
108 |
new_link->next = 0xFFFF; |
|
109 |
||
110 |
link->next = PATHFIND_GET_LINK_OFFS(tpf, new_link); |
|
111 |
return true; |
|
112 |
} |
|
113 |
||
114 |
static const byte _bits_mask[4] = { |
|
115 |
0x19, |
|
116 |
0x16, |
|
117 |
0x25, |
|
118 |
0x2A, |
|
119 |
}; |
|
120 |
||
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
121 |
static const DiagDirection _tpf_new_direction[14] = { |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
122 |
DIAGDIR_NE, DIAGDIR_SE, DIAGDIR_NE, DIAGDIR_SE, DIAGDIR_SW, DIAGDIR_SE, |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
123 |
INVALID_DIAGDIR, INVALID_DIAGDIR, |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
124 |
DIAGDIR_SW, DIAGDIR_NW, DIAGDIR_NW, DIAGDIR_SW, DIAGDIR_NW, DIAGDIR_NE, |
0 | 125 |
}; |
126 |
||
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
127 |
static const DiagDirection _tpf_prev_direction[14] = { |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
128 |
DIAGDIR_NE, DIAGDIR_SE, DIAGDIR_SE, DIAGDIR_NE, DIAGDIR_SE, DIAGDIR_SW, |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
129 |
INVALID_DIAGDIR, INVALID_DIAGDIR, |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
130 |
DIAGDIR_SW, DIAGDIR_NW, DIAGDIR_SW, DIAGDIR_NW, DIAGDIR_NE, DIAGDIR_NW, |
0 | 131 |
}; |
132 |
||
133 |
||
134 |
static const byte _otherdir_mask[4] = { |
|
135 |
0x10, |
|
136 |
0, |
|
137 |
0x5, |
|
138 |
0x2A, |
|
139 |
}; |
|
140 |
||
3153
e83501906eae
(svn r3776) Replace many ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3132
diff
changeset
|
141 |
static void TPFMode2(TrackPathFinder* tpf, TileIndex tile, DiagDirection direction) |
0 | 142 |
{ |
143 |
uint bits; |
|
144 |
RememberData rd; |
|
747
4bf34cf669d0
(svn r1203) -Fix: the pathfinder no longer sees rail with an other owner as a
truelight
parents:
679
diff
changeset
|
145 |
|
3618
5cf2fa302933
(svn r4515) -Codechange: TPFMode2 is currently only used for TRANSPORT_WATER. So remove all stuff that deals with other transport types and assert TRANSPORT_WATER
celestar
parents:
3420
diff
changeset
|
146 |
assert(tpf->tracktype == TRANSPORT_WATER); |
0 | 147 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
148 |
/* This addition will sometimes overflow by a single tile. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
149 |
* The use of TILE_MASK here makes sure that we still point at a valid |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
150 |
* tile, and then this tile will be in the sentinel row/col, so GetTileTrackStatus will fail. */ |
4559
aa0c13e39840
(svn r6406) -Codechange: Rename TileOffsByDir to TileOffsByDiagDir because it accepts
Darkvater
parents:
4406
diff
changeset
|
151 |
tile = TILE_MASK(tile + TileOffsByDiagDir(direction)); |
0 | 152 |
|
153 |
if (++tpf->rd.cur_length > 50) |
|
154 |
return; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
155 |
|
6683
b88ae30866ce
(svn r9914) -Codechange: prepare GTTS and the pathfinders to handle multiple road types on a single tile.
rubidium
parents:
6491
diff
changeset
|
156 |
bits = GetTileTrackStatus(tile, tpf->tracktype, tpf->sub_type); |
0 | 157 |
bits = (byte)((bits | (bits >> 8)) & _bits_mask[direction]); |
158 |
if (bits == 0) |
|
159 |
return; |
|
160 |
||
926
a6d140a6a4de
(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:
913
diff
changeset
|
161 |
assert(TileX(tile) != MapMaxX() && TileY(tile) != MapMaxY()); |
0 | 162 |
|
7930
f12c2437a050
(svn r11483) -Codechange: Replace codeparts with functions that do the same to increase readability
skidd13
parents:
7928
diff
changeset
|
163 |
uint i = 0; |
f12c2437a050
(svn r11483) -Codechange: Replace codeparts with functions that do the same to increase readability
skidd13
parents:
7928
diff
changeset
|
164 |
/* only one direction */ |
f12c2437a050
(svn r11483) -Codechange: Replace codeparts with functions that do the same to increase readability
skidd13
parents:
7928
diff
changeset
|
165 |
if (KillFirstBit(bits) == 0) { |
f12c2437a050
(svn r11483) -Codechange: Replace codeparts with functions that do the same to increase readability
skidd13
parents:
7928
diff
changeset
|
166 |
i = FindFirstBit(bits); |
0 | 167 |
rd = tpf->rd; |
168 |
goto continue_here; |
|
169 |
} |
|
170 |
/* several directions */ |
|
171 |
do { |
|
7930
f12c2437a050
(svn r11483) -Codechange: Replace codeparts with functions that do the same to increase readability
skidd13
parents:
7928
diff
changeset
|
172 |
i = FindFirstBit(bits); |
0 | 173 |
rd = tpf->rd; |
174 |
||
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
175 |
/* Change direction 4 times only */ |
0 | 176 |
if ((byte)i != tpf->rd.pft_var6) { |
2952 | 177 |
if (++tpf->rd.depth > 4) { |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
178 |
tpf->rd = rd; |
0 | 179 |
return; |
180 |
} |
|
181 |
tpf->rd.pft_var6 = (byte)i; |
|
182 |
} |
|
183 |
||
7930
f12c2437a050
(svn r11483) -Codechange: Replace codeparts with functions that do the same to increase readability
skidd13
parents:
7928
diff
changeset
|
184 |
continue_here: |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7833
diff
changeset
|
185 |
tpf->the_dir = (Trackdir)(i + (HasBit(_otherdir_mask[direction], i) ? 8 : 0)); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
186 |
|
0 | 187 |
if (!tpf->enum_proc(tile, tpf->userdata, tpf->the_dir, tpf->rd.cur_length, NULL)) { |
188 |
TPFMode2(tpf, tile, _tpf_new_direction[tpf->the_dir]); |
|
189 |
} |
|
190 |
||
191 |
tpf->rd = rd; |
|
7930
f12c2437a050
(svn r11483) -Codechange: Replace codeparts with functions that do the same to increase readability
skidd13
parents:
7928
diff
changeset
|
192 |
} while (ClrBit(bits, i) != 0); |
0 | 193 |
|
194 |
} |
|
195 |
||
196 |
||
22 | 197 |
/* Returns the end tile and the length of a tunnel. The length does not |
198 |
* include the starting tile (entry), it does include the end tile (exit). |
|
199 |
*/ |
|
3420 | 200 |
FindLengthOfTunnelResult FindLengthOfTunnel(TileIndex tile, DiagDirection dir) |
0 | 201 |
{ |
4559
aa0c13e39840
(svn r6406) -Codechange: Rename TileOffsByDir to TileOffsByDiagDir because it accepts
Darkvater
parents:
4406
diff
changeset
|
202 |
TileIndexDiff delta = TileOffsByDiagDir(dir); |
3420 | 203 |
uint z = GetTileZ(tile); |
0 | 204 |
FindLengthOfTunnelResult flotr; |
205 |
||
206 |
flotr.length = 0; |
|
207 |
||
3420 | 208 |
dir = ReverseDiagDir(dir); |
209 |
do { |
|
0 | 210 |
flotr.length++; |
3420 | 211 |
tile += delta; |
212 |
} while( |
|
213 |
!IsTunnelTile(tile) || |
|
8083
ad22eade501f
(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h
smatz
parents:
7971
diff
changeset
|
214 |
GetTunnelBridgeDirection(tile) != dir || |
3420 | 215 |
GetTileZ(tile) != z |
216 |
); |
|
0 | 217 |
|
218 |
flotr.tile = tile; |
|
219 |
return flotr; |
|
220 |
} |
|
221 |
||
222 |
static const uint16 _tpfmode1_and[4] = { 0x1009, 0x16, 0x520, 0x2A00 }; |
|
223 |
||
3157
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3154
diff
changeset
|
224 |
static uint SkipToEndOfTunnel(TrackPathFinder* tpf, TileIndex tile, DiagDirection direction) |
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1901
diff
changeset
|
225 |
{ |
0 | 226 |
FindLengthOfTunnelResult flotr; |
227 |
TPFSetTileBit(tpf, tile, 14); |
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
148
diff
changeset
|
228 |
flotr = FindLengthOfTunnel(tile, direction); |
0 | 229 |
tpf->rd.cur_length += flotr.length; |
230 |
TPFSetTileBit(tpf, flotr.tile, 14); |
|
231 |
return flotr.tile; |
|
232 |
} |
|
233 |
||
7071
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
234 |
static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection direction); |
0 | 235 |
|
7071
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
236 |
/** Most code of the "Normal" case of TPF Mode 1; for signals special tricks |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
237 |
* have to be done, but those happen in TPFMode1; this is just to prevent |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
238 |
* gotos ;). */ |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
239 |
static inline void TPFMode1_NormalCase(TrackPathFinder* tpf, TileIndex tile, TileIndex tile_org, DiagDirection direction) |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
240 |
{ |
5455
b3ceb5649239
(svn r7716) -Revert r7620: Changes introduced more problems than they fixed (and a goto?)
peter1138
parents:
5417
diff
changeset
|
241 |
/* Check in case of rail if the owner is the same */ |
b3ceb5649239
(svn r7716) -Revert r7620: Changes introduced more problems than they fixed (and a goto?)
peter1138
parents:
5417
diff
changeset
|
242 |
if (tpf->tracktype == TRANSPORT_RAIL) { |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
243 |
/* don't enter train depot from the back */ |
5455
b3ceb5649239
(svn r7716) -Revert r7620: Changes introduced more problems than they fixed (and a goto?)
peter1138
parents:
5417
diff
changeset
|
244 |
if (IsTileDepotType(tile, TRANSPORT_RAIL) && GetRailDepotDirection(tile) == direction) return; |
5417
a0224e6cedd1
(svn r7620) -Fix: [OPF] signal update was incorrectly propagated:
KUDr
parents:
5385
diff
changeset
|
245 |
|
5455
b3ceb5649239
(svn r7716) -Revert r7620: Changes introduced more problems than they fixed (and a goto?)
peter1138
parents:
5417
diff
changeset
|
246 |
if (IsTileType(tile_org, MP_RAILWAY) || IsTileType(tile_org, MP_STATION) || IsTileType(tile_org, MP_TUNNELBRIDGE)) |
b3ceb5649239
(svn r7716) -Revert r7620: Changes introduced more problems than they fixed (and a goto?)
peter1138
parents:
5417
diff
changeset
|
247 |
if (IsTileType(tile, MP_RAILWAY) || IsTileType(tile, MP_STATION) || IsTileType(tile, MP_TUNNELBRIDGE)) |
b3ceb5649239
(svn r7716) -Revert r7620: Changes introduced more problems than they fixed (and a goto?)
peter1138
parents:
5417
diff
changeset
|
248 |
if (GetTileOwner(tile_org) != GetTileOwner(tile)) return; |
752
4e4ec58ba45f
(svn r1208) -Fix: the owner-check introduced in r1203 now also works correctly for
truelight
parents:
747
diff
changeset
|
249 |
} |
747
4bf34cf669d0
(svn r1203) -Fix: the pathfinder no longer sees rail with an other owner as a
truelight
parents:
679
diff
changeset
|
250 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
251 |
/* check if the new tile can be entered from that direction */ |
5455
b3ceb5649239
(svn r7716) -Revert r7620: Changes introduced more problems than they fixed (and a goto?)
peter1138
parents:
5417
diff
changeset
|
252 |
if (tpf->tracktype == TRANSPORT_ROAD) { |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
253 |
/* road stops and depots now have a track (r4419) |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
254 |
* don't enter road stop from the back */ |
6012
065d7234a7a9
(svn r8735) -Feature: drive-through road stops made possible by the hard work of mart3p.
rubidium
parents:
5733
diff
changeset
|
255 |
if (IsStandardRoadStopTile(tile) && ReverseDiagDir(GetRoadStopDir(tile)) != direction) return; |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
256 |
/* don't enter road depot from the back */ |
5455
b3ceb5649239
(svn r7716) -Revert r7620: Changes introduced more problems than they fixed (and a goto?)
peter1138
parents:
5417
diff
changeset
|
257 |
if (IsTileDepotType(tile, TRANSPORT_ROAD) && ReverseDiagDir(GetRoadDepotDirection(tile)) != direction) return; |
b3ceb5649239
(svn r7716) -Revert r7620: Changes introduced more problems than they fixed (and a goto?)
peter1138
parents:
5417
diff
changeset
|
258 |
} |
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3894
diff
changeset
|
259 |
|
5457
a0591c7d9db8
(svn r7718) -Fix (runknown): When pathfinding onto a bridge or tunnel end from
peter1138
parents:
5456
diff
changeset
|
260 |
/* Check if the new tile is a tunnel or bridge head and that the direction |
a0591c7d9db8
(svn r7718) -Fix (runknown): When pathfinding onto a bridge or tunnel end from
peter1138
parents:
5456
diff
changeset
|
261 |
* and transport type match */ |
a0591c7d9db8
(svn r7718) -Fix (runknown): When pathfinding onto a bridge or tunnel end from
peter1138
parents:
5456
diff
changeset
|
262 |
if (IsTileType(tile, MP_TUNNELBRIDGE)) { |
8088
92fca5b09665
(svn r11649) -Codechange: some code can be simplified thanks to changes in r11642
smatz
parents:
8083
diff
changeset
|
263 |
if (GetTunnelBridgeDirection(tile) != direction || |
92fca5b09665
(svn r11649) -Codechange: some code can be simplified thanks to changes in r11642
smatz
parents:
8083
diff
changeset
|
264 |
GetTunnelBridgeTransportType(tile) != tpf->tracktype) { |
92fca5b09665
(svn r11649) -Codechange: some code can be simplified thanks to changes in r11642
smatz
parents:
8083
diff
changeset
|
265 |
return; |
5457
a0591c7d9db8
(svn r7718) -Fix (runknown): When pathfinding onto a bridge or tunnel end from
peter1138
parents:
5456
diff
changeset
|
266 |
} |
a0591c7d9db8
(svn r7718) -Fix (runknown): When pathfinding onto a bridge or tunnel end from
peter1138
parents:
5456
diff
changeset
|
267 |
} |
a0591c7d9db8
(svn r7718) -Fix (runknown): When pathfinding onto a bridge or tunnel end from
peter1138
parents:
5456
diff
changeset
|
268 |
|
0 | 269 |
tpf->rd.cur_length++; |
270 |
||
7071
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
271 |
uint bits = GetTileTrackStatus(tile, tpf->tracktype, tpf->sub_type); |
5455
b3ceb5649239
(svn r7716) -Revert r7620: Changes introduced more problems than they fixed (and a goto?)
peter1138
parents:
5417
diff
changeset
|
272 |
|
0 | 273 |
if ((byte)bits != tpf->var2) { |
274 |
bits &= _tpfmode1_and[direction]; |
|
7930
f12c2437a050
(svn r11483) -Codechange: Replace codeparts with functions that do the same to increase readability
skidd13
parents:
7928
diff
changeset
|
275 |
bits |= bits >> 8; |
0 | 276 |
} |
277 |
bits &= 0xBF; |
|
278 |
||
279 |
if (bits != 0) { |
|
7833
ba402b153b79
(svn r11383) -Codechange: fixed all the mess around KillFirstBit (tnx to Rubidium and skidd13)
truelight
parents:
7081
diff
changeset
|
280 |
if (!tpf->disable_tile_hash || (tpf->rd.cur_length <= 64 && (KillFirstBit(bits) == 0 || ++tpf->rd.depth <= 7))) { |
0 | 281 |
do { |
7071
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
282 |
int i = FIND_FIRST_BIT(bits); |
7833
ba402b153b79
(svn r11383) -Codechange: fixed all the mess around KillFirstBit (tnx to Rubidium and skidd13)
truelight
parents:
7081
diff
changeset
|
283 |
bits = KillFirstBit(bits); |
0 | 284 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
285 |
tpf->the_dir = (Trackdir)((_otherdir_mask[direction] & (byte)(1 << i)) ? (i + 8) : i); |
7071
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
286 |
RememberData rd = tpf->rd; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
287 |
|
0 | 288 |
if (TPFSetTileBit(tpf, tile, tpf->the_dir) && |
289 |
!tpf->enum_proc(tile, tpf->userdata, tpf->the_dir, tpf->rd.cur_length, &tpf->rd.pft_var6) ) { |
|
290 |
TPFMode1(tpf, tile, _tpf_new_direction[tpf->the_dir]); |
|
291 |
} |
|
292 |
tpf->rd = rd; |
|
293 |
} while (bits != 0); |
|
294 |
} |
|
295 |
} |
|
7071
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
296 |
} |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
297 |
|
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
298 |
static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection direction) |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
299 |
{ |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
300 |
TileIndex tile_org = tile; |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
301 |
|
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
302 |
if (IsTileType(tile, MP_TUNNELBRIDGE)) { |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
303 |
if (IsTunnel(tile)) { |
8083
ad22eade501f
(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h
smatz
parents:
7971
diff
changeset
|
304 |
if (GetTunnelBridgeTransportType(tile) != tpf->tracktype) { |
7071
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
305 |
return; |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
306 |
} |
7080
f94ff65485b5
(svn r10345) -Fix [FS#290]: Make OPF handle coming out of a tunnel as well as going into a tunnel, to support road vehicles looking back when finding a depot while in a tunnel.
matthijs
parents:
7071
diff
changeset
|
307 |
/* Only skip through the tunnel if heading inwards. We can |
f94ff65485b5
(svn r10345) -Fix [FS#290]: Make OPF handle coming out of a tunnel as well as going into a tunnel, to support road vehicles looking back when finding a depot while in a tunnel.
matthijs
parents:
7071
diff
changeset
|
308 |
* be headed outwards if our starting position was in a |
f94ff65485b5
(svn r10345) -Fix [FS#290]: Make OPF handle coming out of a tunnel as well as going into a tunnel, to support road vehicles looking back when finding a depot while in a tunnel.
matthijs
parents:
7071
diff
changeset
|
309 |
* tunnel and we're pathfinding backwards */ |
8083
ad22eade501f
(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h
smatz
parents:
7971
diff
changeset
|
310 |
if (GetTunnelBridgeDirection(tile) == direction) { |
7080
f94ff65485b5
(svn r10345) -Fix [FS#290]: Make OPF handle coming out of a tunnel as well as going into a tunnel, to support road vehicles looking back when finding a depot while in a tunnel.
matthijs
parents:
7071
diff
changeset
|
311 |
tile = SkipToEndOfTunnel(tpf, tile, direction); |
8083
ad22eade501f
(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h
smatz
parents:
7971
diff
changeset
|
312 |
} else if (GetTunnelBridgeDirection(tile) != ReverseDiagDir(direction)) { |
7080
f94ff65485b5
(svn r10345) -Fix [FS#290]: Make OPF handle coming out of a tunnel as well as going into a tunnel, to support road vehicles looking back when finding a depot while in a tunnel.
matthijs
parents:
7071
diff
changeset
|
313 |
/* We don't support moving through the sides of a tunnel |
f94ff65485b5
(svn r10345) -Fix [FS#290]: Make OPF handle coming out of a tunnel as well as going into a tunnel, to support road vehicles looking back when finding a depot while in a tunnel.
matthijs
parents:
7071
diff
changeset
|
314 |
* entrance :-) */ |
f94ff65485b5
(svn r10345) -Fix [FS#290]: Make OPF handle coming out of a tunnel as well as going into a tunnel, to support road vehicles looking back when finding a depot while in a tunnel.
matthijs
parents:
7071
diff
changeset
|
315 |
return; |
f94ff65485b5
(svn r10345) -Fix [FS#290]: Make OPF handle coming out of a tunnel as well as going into a tunnel, to support road vehicles looking back when finding a depot while in a tunnel.
matthijs
parents:
7071
diff
changeset
|
316 |
} |
7071
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
317 |
} else { |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
318 |
TileIndex tile_end; |
8083
ad22eade501f
(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h
smatz
parents:
7971
diff
changeset
|
319 |
if (GetTunnelBridgeDirection(tile) != direction || |
ad22eade501f
(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h
smatz
parents:
7971
diff
changeset
|
320 |
GetTunnelBridgeTransportType(tile) != tpf->tracktype) { |
7071
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
321 |
return; |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
322 |
} |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
323 |
//fprintf(stderr, "%s: Planning over bridge\n", __func__); |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
324 |
// TODO doesn't work - WHAT doesn't work? |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
325 |
TPFSetTileBit(tpf, tile, 14); |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
326 |
tile_end = GetOtherBridgeEnd(tile); |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
327 |
tpf->rd.cur_length += DistanceManhattan(tile, tile_end); |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
328 |
tile = tile_end; |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
329 |
TPFSetTileBit(tpf, tile, 14); |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
330 |
} |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
331 |
} |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
332 |
tile += TileOffsByDiagDir(direction); |
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
333 |
|
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
334 |
TPFMode1_NormalCase(tpf, tile, tile_org, direction); |
0 | 335 |
|
336 |
/* the next is only used when signals are checked. |
|
337 |
* seems to go in 2 directions simultaneously */ |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
338 |
|
0 | 339 |
/* if i can get rid of this, tail end recursion can be used to minimize |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
340 |
* stack space dramatically. */ |
2006
9d5d7fd428c2
(svn r2514) - Codechange: [NPF] Move the checking of railtype into a funciton IsCompatibleRail().
matthijs
parents:
1986
diff
changeset
|
341 |
|
9d5d7fd428c2
(svn r2514) - Codechange: [NPF] Move the checking of railtype into a funciton IsCompatibleRail().
matthijs
parents:
1986
diff
changeset
|
342 |
/* If we are doing signal setting, we must reverse at evere tile, so we |
9d5d7fd428c2
(svn r2514) - Codechange: [NPF] Move the checking of railtype into a funciton IsCompatibleRail().
matthijs
parents:
1986
diff
changeset
|
343 |
* iterate all the tracks in a signal block, even when a normal train would |
9d5d7fd428c2
(svn r2514) - Codechange: [NPF] Move the checking of railtype into a funciton IsCompatibleRail().
matthijs
parents:
1986
diff
changeset
|
344 |
* not reach it (for example, when two lines merge */ |
0 | 345 |
if (tpf->hasbit_13) |
346 |
return; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
347 |
|
3153
e83501906eae
(svn r3776) Replace many ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3132
diff
changeset
|
348 |
direction = ReverseDiagDir(direction); |
5456
6ae660a4f3a5
(svn r7717) -Fix (runknown): When following path for signals, don't skip back to the
peter1138
parents:
5455
diff
changeset
|
349 |
tile += TileOffsByDiagDir(direction); |
0 | 350 |
|
7071
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
351 |
uint bits = GetTileTrackStatus(tile, tpf->tracktype, tpf->sub_type); |
0 | 352 |
bits |= (bits >> 8); |
353 |
||
354 |
if ( (byte)bits != tpf->var2) { |
|
355 |
bits &= _bits_mask[direction]; |
|
356 |
} |
|
357 |
||
358 |
bits &= 0xBF; |
|
359 |
if (bits == 0) |
|
360 |
return; |
|
361 |
||
362 |
do { |
|
7071
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
363 |
uint i = FIND_FIRST_BIT(bits); |
7833
ba402b153b79
(svn r11383) -Codechange: fixed all the mess around KillFirstBit (tnx to Rubidium and skidd13)
truelight
parents:
7081
diff
changeset
|
364 |
bits = KillFirstBit(bits); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
365 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
366 |
tpf->the_dir = (Trackdir)((_otherdir_mask[direction] & (byte)(1 << i)) ? (i + 8) : i); |
7071
625657fed875
(svn r10336) -Fix [FS#910]: reaching the end of a line in certain cases incorrectly stopped signal updates
peter1138
parents:
6683
diff
changeset
|
367 |
RememberData rd = tpf->rd; |
0 | 368 |
if (TPFSetTileBit(tpf, tile, tpf->the_dir) && |
369 |
!tpf->enum_proc(tile, tpf->userdata, tpf->the_dir, tpf->rd.cur_length, &tpf->rd.pft_var6) ) { |
|
370 |
TPFMode1(tpf, tile, _tpf_new_direction[tpf->the_dir]); |
|
371 |
} |
|
372 |
tpf->rd = rd; |
|
373 |
} while (bits != 0); |
|
374 |
} |
|
375 |
||
6683
b88ae30866ce
(svn r9914) -Codechange: prepare GTTS and the pathfinders to handle multiple road types on a single tile.
rubidium
parents:
6491
diff
changeset
|
376 |
void FollowTrack(TileIndex tile, uint16 flags, uint sub_type, DiagDirection direction, TPFEnumProc *enum_proc, TPFAfterProc *after_proc, void *data) |
0 | 377 |
{ |
318
648afd1ab9a7
(svn r328) -Fix: remove some unlogical alloca()s (Tron)
darkvater
parents:
241
diff
changeset
|
378 |
TrackPathFinder tpf; |
0 | 379 |
|
380 |
assert(direction < 4); |
|
381 |
||
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
382 |
/* initialize path finder variables */ |
318
648afd1ab9a7
(svn r328) -Fix: remove some unlogical alloca()s (Tron)
darkvater
parents:
241
diff
changeset
|
383 |
tpf.userdata = data; |
648afd1ab9a7
(svn r328) -Fix: remove some unlogical alloca()s (Tron)
darkvater
parents:
241
diff
changeset
|
384 |
tpf.enum_proc = enum_proc; |
648afd1ab9a7
(svn r328) -Fix: remove some unlogical alloca()s (Tron)
darkvater
parents:
241
diff
changeset
|
385 |
tpf.new_link = tpf.links; |
648afd1ab9a7
(svn r328) -Fix: remove some unlogical alloca()s (Tron)
darkvater
parents:
241
diff
changeset
|
386 |
tpf.num_links_left = lengthof(tpf.links); |
0 | 387 |
|
318
648afd1ab9a7
(svn r328) -Fix: remove some unlogical alloca()s (Tron)
darkvater
parents:
241
diff
changeset
|
388 |
tpf.rd.cur_length = 0; |
648afd1ab9a7
(svn r328) -Fix: remove some unlogical alloca()s (Tron)
darkvater
parents:
241
diff
changeset
|
389 |
tpf.rd.depth = 0; |
648afd1ab9a7
(svn r328) -Fix: remove some unlogical alloca()s (Tron)
darkvater
parents:
241
diff
changeset
|
390 |
tpf.rd.pft_var6 = 0; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
391 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7833
diff
changeset
|
392 |
tpf.var2 = HasBit(flags, 15) ? 0x43 : 0xFF; // 0x8000 |
0 | 393 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7833
diff
changeset
|
394 |
tpf.disable_tile_hash = HasBit(flags, 12); // 0x1000 |
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7833
diff
changeset
|
395 |
tpf.hasbit_13 = HasBit(flags, 13); // 0x2000 |
0 | 396 |
|
397 |
||
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
398 |
tpf.tracktype = (TransportType)(flags & 0xFF); |
6683
b88ae30866ce
(svn r9914) -Codechange: prepare GTTS and the pathfinders to handle multiple road types on a single tile.
rubidium
parents:
6491
diff
changeset
|
399 |
tpf.sub_type = sub_type; |
0 | 400 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7833
diff
changeset
|
401 |
if (HasBit(flags, 11)) { |
318
648afd1ab9a7
(svn r328) -Fix: remove some unlogical alloca()s (Tron)
darkvater
parents:
241
diff
changeset
|
402 |
tpf.rd.pft_var6 = 0xFF; |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
403 |
tpf.enum_proc(tile, data, INVALID_TRACKDIR, 0, 0); |
318
648afd1ab9a7
(svn r328) -Fix: remove some unlogical alloca()s (Tron)
darkvater
parents:
241
diff
changeset
|
404 |
TPFMode2(&tpf, tile, direction); |
0 | 405 |
} else { |
406 |
/* clear the hash_heads */ |
|
318
648afd1ab9a7
(svn r328) -Fix: remove some unlogical alloca()s (Tron)
darkvater
parents:
241
diff
changeset
|
407 |
memset(tpf.hash_head, 0, sizeof(tpf.hash_head)); |
648afd1ab9a7
(svn r328) -Fix: remove some unlogical alloca()s (Tron)
darkvater
parents:
241
diff
changeset
|
408 |
TPFMode1(&tpf, tile, direction); |
0 | 409 |
} |
410 |
||
411 |
if (after_proc != NULL) |
|
318
648afd1ab9a7
(svn r328) -Fix: remove some unlogical alloca()s (Tron)
darkvater
parents:
241
diff
changeset
|
412 |
after_proc(&tpf); |
0 | 413 |
} |
414 |
||
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6172
diff
changeset
|
415 |
struct StackedItem { |
0 | 416 |
TileIndex tile; |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
417 |
uint16 cur_length; ///< This is the current length to this tile. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
418 |
uint16 priority; ///< This is the current length + estimated length to the goal. |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
419 |
TrackdirByte track; |
0 | 420 |
byte depth; |
421 |
byte state; |
|
422 |
byte first_track; |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6172
diff
changeset
|
423 |
}; |
0 | 424 |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
425 |
static const Trackdir _new_trackdir[6][4] = { |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
426 |
{TRACKDIR_X_NE, INVALID_TRACKDIR, TRACKDIR_X_SW, INVALID_TRACKDIR,}, |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
427 |
{INVALID_TRACKDIR, TRACKDIR_Y_SE, INVALID_TRACKDIR, TRACKDIR_Y_NW,}, |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
428 |
{INVALID_TRACKDIR, TRACKDIR_UPPER_E, TRACKDIR_UPPER_W, INVALID_TRACKDIR,}, |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
429 |
{TRACKDIR_LOWER_E, INVALID_TRACKDIR, INVALID_TRACKDIR, TRACKDIR_LOWER_W,}, |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
430 |
{TRACKDIR_LEFT_N, TRACKDIR_LEFT_S, INVALID_TRACKDIR, INVALID_TRACKDIR,}, |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
431 |
{INVALID_TRACKDIR, INVALID_TRACKDIR, TRACKDIR_RIGHT_S, TRACKDIR_RIGHT_N,}, |
0 | 432 |
}; |
433 |
||
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6172
diff
changeset
|
434 |
struct HashLink { |
0 | 435 |
TileIndex tile; |
436 |
uint16 typelength; |
|
437 |
uint16 next; |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6172
diff
changeset
|
438 |
}; |
0 | 439 |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6172
diff
changeset
|
440 |
struct NewTrackPathFinder { |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
441 |
NTPEnumProc *enum_proc; |
0 | 442 |
void *userdata; |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
443 |
TileIndex dest; |
0 | 444 |
|
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3267
diff
changeset
|
445 |
TransportType tracktype; |
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3267
diff
changeset
|
446 |
RailTypeMask railtypes; |
0 | 447 |
uint maxlength; |
448 |
||
449 |
HashLink *new_link; |
|
450 |
uint num_links_left; |
|
451 |
||
979
11ea18598e16
(svn r1475) Fix some more signed/unsigned comparison warnings
tron
parents:
926
diff
changeset
|
452 |
uint nstack; |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
453 |
StackedItem stack[256]; ///< priority queue of stacked items |
0 | 454 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
455 |
uint16 hash_head[0x400]; ///< hash heads. 0 means unused. 0xFFFC = length, 0x3 = dir |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
456 |
TileIndex hash_tile[0x400]; ///< tiles. or links. |
0 | 457 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
458 |
HashLink links[0x400]; ///< hash links |
0 | 459 |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6172
diff
changeset
|
460 |
}; |
0 | 461 |
#define NTP_GET_LINK_OFFS(tpf, link) ((byte*)(link) - (byte*)tpf->links) |
462 |
#define NTP_GET_LINK_PTR(tpf, link_offs) (HashLink*)((byte*)tpf->links + (link_offs)) |
|
463 |
||
464 |
#define ARR(i) tpf->stack[(i)-1] |
|
465 |
||
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
466 |
/** called after a new element was added in the queue at the last index. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
467 |
* move it down to the proper position */ |
536 | 468 |
static inline void HeapifyUp(NewTrackPathFinder *tpf) |
0 | 469 |
{ |
470 |
StackedItem si; |
|
471 |
int i = ++tpf->nstack; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
472 |
|
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
473 |
while (i != 1 && ARR(i).priority < ARR(i>>1).priority) { |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
474 |
/* the child element is larger than the parent item. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
475 |
* swap the child item and the parent item. */ |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
476 |
si = ARR(i); ARR(i) = ARR(i >> 1); ARR(i >> 1) = si; |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
477 |
i >>= 1; |
0 | 478 |
} |
479 |
} |
|
480 |
||
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
481 |
/** called after the element 0 was eaten. fill it with a new element */ |
536 | 482 |
static inline void HeapifyDown(NewTrackPathFinder *tpf) |
0 | 483 |
{ |
484 |
StackedItem si; |
|
485 |
int i = 1, j; |
|
979
11ea18598e16
(svn r1475) Fix some more signed/unsigned comparison warnings
tron
parents:
926
diff
changeset
|
486 |
int n; |
11ea18598e16
(svn r1475) Fix some more signed/unsigned comparison warnings
tron
parents:
926
diff
changeset
|
487 |
|
11ea18598e16
(svn r1475) Fix some more signed/unsigned comparison warnings
tron
parents:
926
diff
changeset
|
488 |
assert(tpf->nstack > 0); |
11ea18598e16
(svn r1475) Fix some more signed/unsigned comparison warnings
tron
parents:
926
diff
changeset
|
489 |
n = --tpf->nstack; |
0 | 490 |
|
491 |
if (n == 0) return; // heap is empty so nothing to do? |
|
492 |
||
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
493 |
/* copy the last item to index 0. we use it as base for heapify. */ |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
494 |
ARR(1) = ARR(n + 1); |
0 | 495 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
496 |
while ((j = i * 2) <= n) { |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
497 |
/* figure out which is smaller of the children. */ |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
498 |
if (j != n && ARR(j).priority > ARR(j + 1).priority) |
0 | 499 |
j++; // right item is smaller |
500 |
||
501 |
assert(i <= n && j <= n); |
|
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
502 |
if (ARR(i).priority <= ARR(j).priority) |
0 | 503 |
break; // base elem smaller than smallest, done! |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
504 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
505 |
/* swap parent with the child */ |
0 | 506 |
si = ARR(i); ARR(i) = ARR(j); ARR(j) = si; |
507 |
i = j; |
|
508 |
} |
|
509 |
} |
|
510 |
||
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
511 |
/** mark a tile as visited and store the length of the path. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
512 |
* if we already had a better path to this tile, return false. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
513 |
* otherwise return true. */ |
3153
e83501906eae
(svn r3776) Replace many ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3132
diff
changeset
|
514 |
static bool NtpVisit(NewTrackPathFinder* tpf, TileIndex tile, DiagDirection dir, uint length) |
0 | 515 |
{ |
516 |
uint hash,head; |
|
517 |
HashLink *link, *new_link; |
|
518 |
||
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
519 |
assert(length < 16384-1); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
520 |
|
0 | 521 |
hash = PATHFIND_HASH_TILE(tile); |
522 |
||
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
523 |
/* never visited before? */ |
0 | 524 |
if ((head=tpf->hash_head[hash]) == 0) { |
525 |
tpf->hash_tile[hash] = tile; |
|
526 |
tpf->hash_head[hash] = dir | (length << 2); |
|
527 |
return true; |
|
528 |
} |
|
529 |
||
530 |
if (head != 0xffff) { |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
531 |
if (tile == tpf->hash_tile[hash] && (head & 0x3) == (uint)dir) { |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
532 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
533 |
/* longer length */ |
0 | 534 |
if (length >= (head >> 2)) return false; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
535 |
|
0 | 536 |
tpf->hash_head[hash] = dir | (length << 2); |
537 |
return true; |
|
538 |
} |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
539 |
/* two tiles with the same hash, need to make a link |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
540 |
* allocate a link. if out of links, handle this by returning |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
541 |
* that a tile was already visisted. */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
542 |
if (tpf->num_links_left == 0) { |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5028
diff
changeset
|
543 |
DEBUG(ntp, 1, "No links left"); |
0 | 544 |
return false; |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
545 |
} |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
546 |
|
0 | 547 |
tpf->num_links_left--; |
548 |
link = tpf->new_link++; |
|
549 |
||
550 |
/* move the data that was previously in the hash_??? variables |
|
551 |
* to the link struct, and let the hash variables point to the link */ |
|
552 |
link->tile = tpf->hash_tile[hash]; |
|
553 |
tpf->hash_tile[hash] = NTP_GET_LINK_OFFS(tpf, link); |
|
554 |
||
555 |
link->typelength = tpf->hash_head[hash]; |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
556 |
tpf->hash_head[hash] = 0xFFFF; // multi link |
0 | 557 |
link->next = 0xFFFF; |
558 |
} else { |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
559 |
/* a linked list of many tiles, |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
560 |
* find the one corresponding to the tile, if it exists. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
561 |
* otherwise make a new link */ |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
562 |
|
0 | 563 |
uint offs = tpf->hash_tile[hash]; |
564 |
do { |
|
565 |
link = NTP_GET_LINK_PTR(tpf, offs); |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
566 |
if (tile == link->tile && (link->typelength & 0x3U) == (uint)dir) { |
3019
9d641b5e630b
(svn r3599) -Fix: added some casts to suppress some more warnings
truelight
parents:
3017
diff
changeset
|
567 |
if (length >= (uint)(link->typelength >> 2)) return false; |
0 | 568 |
link->typelength = dir | (length << 2); |
569 |
return true; |
|
570 |
} |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2952
diff
changeset
|
571 |
} while ((offs = link->next) != 0xFFFF); |
0 | 572 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
573 |
|
0 | 574 |
/* get here if we need to add a new link to link, |
575 |
* first, allocate a new link, in the same way as before */ |
|
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
576 |
if (tpf->num_links_left == 0) { |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5028
diff
changeset
|
577 |
DEBUG(ntp, 1, "No links left"); |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
578 |
return false; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
579 |
} |
0 | 580 |
tpf->num_links_left--; |
581 |
new_link = tpf->new_link++; |
|
582 |
||
583 |
/* then fill the link with the new info, and establish a ptr from the old |
|
584 |
* link to the new one */ |
|
1986
fcc849a38ae6
(svn r2492) Remove some pointless casts and fix some nearby indentation
tron
parents:
1980
diff
changeset
|
585 |
new_link->tile = tile; |
0 | 586 |
new_link->typelength = dir | (length << 2); |
587 |
new_link->next = 0xFFFF; |
|
588 |
||
589 |
link->next = NTP_GET_LINK_OFFS(tpf, new_link); |
|
590 |
return true; |
|
591 |
} |
|
592 |
||
2782 | 593 |
/** |
594 |
* Checks if the shortest path to the given tile/dir so far is still the given |
|
595 |
* length. |
|
596 |
* @return true if the length is still the same |
|
597 |
* @pre The given tile/dir combination should be present in the hash, by a |
|
598 |
* previous call to NtpVisit(). |
|
599 |
*/ |
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1901
diff
changeset
|
600 |
static bool NtpCheck(NewTrackPathFinder *tpf, TileIndex tile, uint dir, uint length) |
0 | 601 |
{ |
602 |
uint hash,head,offs; |
|
603 |
HashLink *link; |
|
604 |
||
605 |
hash = PATHFIND_HASH_TILE(tile); |
|
606 |
head=tpf->hash_head[hash]; |
|
607 |
assert(head); |
|
608 |
||
609 |
if (head != 0xffff) { |
|
610 |
assert( tpf->hash_tile[hash] == tile && (head & 3) == dir); |
|
611 |
assert( (head >> 2) <= length); |
|
612 |
return length == (head >> 2); |
|
613 |
} |
|
614 |
||
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
615 |
/* else it's a linked list of many tiles */ |
0 | 616 |
offs = tpf->hash_tile[hash]; |
2952 | 617 |
for (;;) { |
0 | 618 |
link = NTP_GET_LINK_PTR(tpf, offs); |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2952
diff
changeset
|
619 |
if (tile == link->tile && (link->typelength & 0x3U) == dir) { |
3019
9d641b5e630b
(svn r3599) -Fix: added some casts to suppress some more warnings
truelight
parents:
3017
diff
changeset
|
620 |
assert((uint)(link->typelength >> 2) <= length); |
9d641b5e630b
(svn r3599) -Fix: added some casts to suppress some more warnings
truelight
parents:
3017
diff
changeset
|
621 |
return length == (uint)(link->typelength >> 2); |
0 | 622 |
} |
623 |
offs = link->next; |
|
624 |
assert(offs != 0xffff); |
|
625 |
} |
|
626 |
} |
|
627 |
||
628 |
||
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
629 |
static const uint16 _is_upwards_slope[15] = { |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
630 |
0, ///< no tileh |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
631 |
(1 << TRACKDIR_X_SW) | (1 << TRACKDIR_Y_NW), ///< 1 |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
632 |
(1 << TRACKDIR_X_SW) | (1 << TRACKDIR_Y_SE), ///< 2 |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
633 |
(1 << TRACKDIR_X_SW), ///< 3 |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
634 |
(1 << TRACKDIR_X_NE) | (1 << TRACKDIR_Y_SE), ///< 4 |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
635 |
0, ///< 5 |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
636 |
(1 << TRACKDIR_Y_SE), ///< 6 |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
637 |
0, ///< 7 |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
638 |
(1 << TRACKDIR_X_NE) | (1 << TRACKDIR_Y_NW), ///< 8, |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
639 |
(1 << TRACKDIR_Y_NW), ///< 9 |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
640 |
0, ///< 10 |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
641 |
0, ///< 11, |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
642 |
(1 << TRACKDIR_X_NE), ///< 12 |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
643 |
0, ///< 13 |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
644 |
0, ///< 14 |
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
645 |
}; |
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
646 |
|
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
647 |
static uint DistanceMoo(TileIndex t0, TileIndex t1) |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
648 |
{ |
7970
7d6b9ab57081
(svn r11526) -Codechange: Rename the function delta fitting to the naming style
skidd13
parents:
7930
diff
changeset
|
649 |
const uint dx = Delta(TileX(t0), TileX(t1)); |
7d6b9ab57081
(svn r11526) -Codechange: Rename the function delta fitting to the naming style
skidd13
parents:
7930
diff
changeset
|
650 |
const uint dy = Delta(TileY(t0), TileY(t1)); |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
651 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
652 |
const uint straightTracks = 2 * min(dx, dy); // The number of straight (not full length) tracks |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
653 |
/* OPTIMISATION: |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
654 |
* Original: diagTracks = max(dx, dy) - min(dx,dy); |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
655 |
* Proof: |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
656 |
* (dx-dy) - straightTracks == (min + max) - straightTracks = min + // max - 2 * min = max - min */ |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
657 |
const uint diagTracks = dx + dy - straightTracks; // The number of diagonal (full tile length) tracks. |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
658 |
|
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
659 |
return diagTracks*DIAG_FACTOR + straightTracks*STR_FACTOR; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
660 |
} |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
661 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
662 |
/* These has to be small cause the max length of a track |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
663 |
* is currently limited to 16384 */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
664 |
|
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
665 |
static const byte _length_of_track[16] = { |
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4081
diff
changeset
|
666 |
DIAG_FACTOR, DIAG_FACTOR, STR_FACTOR, STR_FACTOR, STR_FACTOR, STR_FACTOR, 0, 0, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4081
diff
changeset
|
667 |
DIAG_FACTOR, DIAG_FACTOR, STR_FACTOR, STR_FACTOR, STR_FACTOR, STR_FACTOR, 0, 0 |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
668 |
}; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
669 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
670 |
/* new more optimized pathfinder for trains... |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
671 |
* Tile is the tile the train is at. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
672 |
* direction is the tile the train is moving towards. */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
673 |
|
3153
e83501906eae
(svn r3776) Replace many ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3132
diff
changeset
|
674 |
static void NTPEnum(NewTrackPathFinder* tpf, TileIndex tile, DiagDirection direction) |
0 | 675 |
{ |
2782 | 676 |
TrackBits bits, allbits; |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
677 |
Trackdir track; |
2782 | 678 |
TileIndex tile_org; |
0 | 679 |
StackedItem si; |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
680 |
int estimation; |
0 | 681 |
|
2261
d3554e5d3e86
(svn r2781) Fix some of the issues with variables in .h files.
ludde
parents:
2186
diff
changeset
|
682 |
|
2136
c87ed6a3c15f
(svn r2646) Change: [ntp] Fix uninitialized variable and add some more asserts to be able to debug an assert error.
ludde
parents:
2125
diff
changeset
|
683 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
684 |
/* Need to have a special case for the start. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
685 |
* We shouldn't call the callback for the current tile. */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
686 |
si.cur_length = 1; // Need to start at 1 cause 0 is a reserved value. |
0 | 687 |
si.depth = 0; |
688 |
si.state = 0; |
|
2136
c87ed6a3c15f
(svn r2646) Change: [ntp] Fix uninitialized variable and add some more asserts to be able to debug an assert error.
ludde
parents:
2125
diff
changeset
|
689 |
si.first_track = 0xFF; |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
690 |
goto start_at; |
0 | 691 |
|
2952 | 692 |
for (;;) { |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
693 |
/* Get the next item to search from from the priority queue */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
694 |
do { |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
695 |
if (tpf->nstack == 0) |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
696 |
return; // nothing left? then we're done! |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
697 |
si = tpf->stack[0]; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
698 |
tile = si.tile; |
0 | 699 |
|
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
700 |
HeapifyDown(tpf); |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
701 |
/* Make sure we havn't already visited this tile. */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
702 |
} while (!NtpCheck(tpf, tile, _tpf_prev_direction[si.track], si.cur_length)); |
0 | 703 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
704 |
/* Add the length of this track. */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
705 |
si.cur_length += _length_of_track[si.track]; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
706 |
|
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
707 |
callback_and_continue: |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
708 |
if (tpf->enum_proc(tile, tpf->userdata, si.first_track, si.cur_length)) |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
709 |
return; |
0 | 710 |
|
2136
c87ed6a3c15f
(svn r2646) Change: [ntp] Fix uninitialized variable and add some more asserts to be able to debug an assert error.
ludde
parents:
2125
diff
changeset
|
711 |
assert(si.track <= 13); |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
712 |
direction = _tpf_new_direction[si.track]; |
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
713 |
|
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
714 |
start_at: |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
715 |
/* If the tile is the entry tile of a tunnel, and we're not going out of the tunnel, |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
716 |
* need to find the exit of the tunnel. */ |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
717 |
if (IsTileType(tile, MP_TUNNELBRIDGE)) { |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
718 |
if (IsTunnel(tile)) { |
8083
ad22eade501f
(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h
smatz
parents:
7971
diff
changeset
|
719 |
if (GetTunnelBridgeDirection(tile) != ReverseDiagDir(direction)) { |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
720 |
FindLengthOfTunnelResult flotr; |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
721 |
|
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
722 |
/* We are not just driving out of the tunnel */ |
8083
ad22eade501f
(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h
smatz
parents:
7971
diff
changeset
|
723 |
if (GetTunnelBridgeDirection(tile) != direction || |
ad22eade501f
(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h
smatz
parents:
7971
diff
changeset
|
724 |
GetTunnelBridgeTransportType(tile) != tpf->tracktype) { |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
725 |
/* We are not driving into the tunnel, or it is an invalid tunnel */ |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
726 |
continue; |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
727 |
} |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7833
diff
changeset
|
728 |
if (!HasBit(tpf->railtypes, GetRailType(tile))) { |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
729 |
bits = TRACK_BIT_NONE; |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
730 |
break; |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
731 |
} |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
732 |
flotr = FindLengthOfTunnel(tile, direction); |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
733 |
si.cur_length += flotr.length * DIAG_FACTOR; |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
734 |
tile = flotr.tile; |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
735 |
/* tile now points to the exit tile of the tunnel */ |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
736 |
} |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
737 |
} else { |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
738 |
TileIndex tile_end; |
8083
ad22eade501f
(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h
smatz
parents:
7971
diff
changeset
|
739 |
if (GetTunnelBridgeDirection(tile) != ReverseDiagDir(direction)) { |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
740 |
/* We are not just leaving the bridge */ |
8083
ad22eade501f
(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h
smatz
parents:
7971
diff
changeset
|
741 |
if (GetTunnelBridgeDirection(tile) != direction || |
ad22eade501f
(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h
smatz
parents:
7971
diff
changeset
|
742 |
GetTunnelBridgeTransportType(tile) != tpf->tracktype) { |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
743 |
/* Not entering the bridge or not compatible */ |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
744 |
continue; |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
745 |
} |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
746 |
} |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
747 |
tile_end = GetOtherBridgeEnd(tile); |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
748 |
si.cur_length += DistanceManhattan(tile, tile_end) * DIAG_FACTOR; |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
749 |
tile = tile_end; |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
750 |
} |
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
751 |
} |
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
752 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
753 |
/* This is a special loop used to go through |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
754 |
* a rail net and find the first intersection */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
755 |
tile_org = tile; |
2952 | 756 |
for (;;) { |
2136
c87ed6a3c15f
(svn r2646) Change: [ntp] Fix uninitialized variable and add some more asserts to be able to debug an assert error.
ludde
parents:
2125
diff
changeset
|
757 |
assert(direction <= 3); |
4559
aa0c13e39840
(svn r6406) -Codechange: Rename TileOffsByDir to TileOffsByDiagDir because it accepts
Darkvater
parents:
4406
diff
changeset
|
758 |
tile += TileOffsByDiagDir(direction); |
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
759 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
760 |
/* too long search length? bail out. */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
761 |
if (si.cur_length >= tpf->maxlength) { |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5028
diff
changeset
|
762 |
DEBUG(ntp, 1, "Cur_length too big"); |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
763 |
bits = TRACK_BIT_NONE; |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
764 |
break; |
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
765 |
} |
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
766 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
767 |
/* Not a regular rail tile? |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
768 |
* Then we can't use the code below, but revert to more general code. */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
769 |
if (!IsTileType(tile, MP_RAILWAY) || !IsPlainRailTile(tile)) { |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
770 |
/* We found a tile which is not a normal railway tile. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
771 |
* Determine which tracks that exist on this tile. */ |
6683
b88ae30866ce
(svn r9914) -Codechange: prepare GTTS and the pathfinders to handle multiple road types on a single tile.
rubidium
parents:
6491
diff
changeset
|
772 |
uint32 ts = GetTileTrackStatus(tile, TRANSPORT_RAIL, 0) & _tpfmode1_and[direction]; |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
773 |
bits = TrackdirBitsToTrackBits((TrackdirBits)(ts & TRACKDIR_BIT_MASK)); |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
774 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
775 |
/* Check that the tile contains exactly one track */ |
7833
ba402b153b79
(svn r11383) -Codechange: fixed all the mess around KillFirstBit (tnx to Rubidium and skidd13)
truelight
parents:
7081
diff
changeset
|
776 |
if (bits == 0 || KillFirstBit(bits) != 0) break; |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
777 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7833
diff
changeset
|
778 |
if (!HasBit(tpf->railtypes, GetRailType(tile))) { |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
779 |
bits = TRACK_BIT_NONE; |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
780 |
break; |
3804
53ad7c93c3d5
(svn r4812) -Fix (FS#161) NTP properly checks for railtypes on non-plain-rail-tiles (Rubidium)
celestar
parents:
3735
diff
changeset
|
781 |
} |
53ad7c93c3d5
(svn r4812) -Fix (FS#161) NTP properly checks for railtypes on non-plain-rail-tiles (Rubidium)
celestar
parents:
3735
diff
changeset
|
782 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
783 |
/******************* |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
784 |
* If we reach here, the tile has exactly one track. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
785 |
* tile - index to a tile that is not rail tile, but still straight (with optional signals) |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
786 |
* bits - bitmask of which track that exist on the tile (exactly one bit is set) |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
787 |
* direction - which direction are we moving in? |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
788 |
*******************/ |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
789 |
si.track = _new_trackdir[FIND_FIRST_BIT(bits)][direction]; |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
790 |
si.cur_length += _length_of_track[si.track]; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
791 |
goto callback_and_continue; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
792 |
} |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
793 |
|
2782 | 794 |
/* Regular rail tile, determine which tracks exist. */ |
3267
feff95208a9f
(svn r3979) Move GetRailFoundation() to rail_map.h and use it and friends to get information about rail tiles
tron
parents:
3234
diff
changeset
|
795 |
allbits = GetTrackBits(tile); |
2782 | 796 |
/* Which tracks are reachable? */ |
797 |
bits = allbits & DiagdirReachesTracks(direction); |
|
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
798 |
|
2782 | 799 |
/* The tile has no reachable tracks => End of rail segment |
800 |
* or Intersection => End of rail segment. We check this agains all the |
|
801 |
* bits, not just reachable ones, to prevent infinite loops. */ |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
802 |
if (bits == TRACK_BIT_NONE || TracksOverlap(allbits)) break; |
2137
bbf04957feec
(svn r2647) Fix: [ntp] Fix assertion error introduced in r2635
ludde
parents:
2136
diff
changeset
|
803 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7833
diff
changeset
|
804 |
if (!HasBit(tpf->railtypes, GetRailType(tile))) { |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
805 |
bits = TRACK_BIT_NONE; |
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3267
diff
changeset
|
806 |
break; |
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3267
diff
changeset
|
807 |
} |
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3267
diff
changeset
|
808 |
|
2782 | 809 |
/* If we reach here, the tile has exactly one track, and this |
6491
00dc414c909d
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6453
diff
changeset
|
810 |
track is reachable = > Rail segment continues */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
811 |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
812 |
track = _new_trackdir[FIND_FIRST_BIT(bits)][direction]; |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
813 |
assert(track != INVALID_TRACKDIR); |
2137
bbf04957feec
(svn r2647) Fix: [ntp] Fix assertion error introduced in r2635
ludde
parents:
2136
diff
changeset
|
814 |
|
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
815 |
si.cur_length += _length_of_track[track]; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
816 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
817 |
/* Check if this rail is an upwards slope. If it is, then add a penalty. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
818 |
* Small optimization here.. if (track&7)>1 then it can't be a slope so we avoid calling GetTileSlope */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
819 |
if ((track & 7) <= 1 && (_is_upwards_slope[GetTileSlope(tile, NULL)] & (1 << track)) ) { |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
820 |
// upwards slope. add some penalty. |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
821 |
si.cur_length += 4 * DIAG_FACTOR; |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
822 |
} |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
823 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
824 |
/* railway tile with signals..? */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
825 |
if (HasSignals(tile)) { |
4631
584a6da986b0
(svn r6495) -Codechange: removed direct map access in pathfind.c
glx
parents:
4559
diff
changeset
|
826 |
if (!HasSignalOnTrackdir(tile, track)) { |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
827 |
/* if one way signal not pointing towards us, stop going in this direction => End of rail segment. */ |
4631
584a6da986b0
(svn r6495) -Codechange: removed direct map access in pathfind.c
glx
parents:
4559
diff
changeset
|
828 |
if (HasSignalOnTrackdir(tile, ReverseTrackdir(track))) { |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
829 |
bits = TRACK_BIT_NONE; |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
830 |
break; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
831 |
} |
4631
584a6da986b0
(svn r6495) -Codechange: removed direct map access in pathfind.c
glx
parents:
4559
diff
changeset
|
832 |
} else if (GetSignalStateByTrackdir(tile, track) == SIGNAL_STATE_GREEN) { |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
833 |
/* green signal in our direction. either one way or two way. */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
834 |
si.state |= 3; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
835 |
} else { |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
836 |
/* reached a red signal. */ |
4631
584a6da986b0
(svn r6495) -Codechange: removed direct map access in pathfind.c
glx
parents:
4559
diff
changeset
|
837 |
if (HasSignalOnTrackdir(tile, ReverseTrackdir(track))) { |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
838 |
/* two way red signal. unless we passed another green signal on the way, |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
839 |
* stop going in this direction => End of rail segment. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
840 |
* this is to prevent us from going into a full platform. */ |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
841 |
if (!(si.state & 1)) { |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
842 |
bits = TRACK_BIT_NONE; |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
843 |
break; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
844 |
} |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
845 |
} |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
846 |
if (!(si.state & 2)) { |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
847 |
/* Is this the first signal we see? And it's red... add penalty */ |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
848 |
si.cur_length += 10 * DIAG_FACTOR; |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
849 |
si.state += 2; // remember that we added penalty. |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
850 |
/* Because we added a penalty, we can't just continue as usual. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
851 |
* Need to get out and let A* do it's job with |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
852 |
* possibly finding an even shorter path. */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
853 |
break; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
854 |
} |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
855 |
} |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
856 |
|
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
857 |
if (tpf->enum_proc(tile, tpf->userdata, si.first_track, si.cur_length)) |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
858 |
return; // Don't process this tile any further |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
859 |
} |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
860 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
861 |
/* continue with the next track */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
862 |
direction = _tpf_new_direction[track]; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
863 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
864 |
/* safety check if we're running around chasing our tail... (infinite loop) */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
865 |
if (tile == tile_org) { |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
866 |
bits = TRACK_BIT_NONE; |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
867 |
break; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
868 |
} |
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
869 |
} |
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
870 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
871 |
/* There are no tracks to choose between. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
872 |
* Stop searching in this direction */ |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
873 |
if (bits == TRACK_BIT_NONE) |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
874 |
continue; |
0 | 875 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
876 |
/**************** |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
877 |
* We got multiple tracks to choose between (intersection). |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
878 |
* Branch the search space into several branches. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
879 |
****************/ |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
159
diff
changeset
|
880 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
881 |
/* Check if we've already visited this intersection. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
882 |
* If we've already visited it with a better length, then |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
883 |
* there's no point in visiting it again. */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
884 |
if (!NtpVisit(tpf, tile, direction, si.cur_length)) |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
885 |
continue; |
0 | 886 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
887 |
/* Push all possible alternatives that we can reach from here |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
888 |
* onto the priority heap. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
889 |
* 'bits' contains the tracks that we can choose between. */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
890 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
891 |
/* First compute the estimated distance to the target. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
892 |
* This is used to implement A* */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
893 |
estimation = 0; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
894 |
if (tpf->dest != 0) |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
895 |
estimation = DistanceMoo(tile, tpf->dest); |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
896 |
|
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
897 |
si.depth++; |
2774
8ab8627b5ba1
(svn r3321) - Fix: A wrong use of the map m5 bits, where a previously calculated "bits" variable should have been used. This resulted in the pathfinder imagining junctions, which negatively affects performance somewhat (Darkvater).
matthijs
parents:
2548
diff
changeset
|
898 |
if (si.depth == 0) |
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
899 |
continue; // We overflowed our depth. No more searching in this direction. |
0 | 900 |
si.tile = tile; |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
901 |
while (bits != TRACK_BIT_NONE) { |
5598
2fadbd43709d
(svn r8052) - Codechange: RemoveFirstTrack() and RemoveFirstTrackdir() now accept pointer to TrackBits/TrackdirBits instead of reference.
KUDr
parents:
5587
diff
changeset
|
902 |
Track track = RemoveFirstTrack(&bits); |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
903 |
si.track = _new_trackdir[track][direction]; |
2782 | 904 |
assert(si.track != 0xFF); |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
905 |
si.priority = si.cur_length + estimation; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
906 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
907 |
/* out of stack items, bail out? */ |
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
908 |
if (tpf->nstack >= lengthof(tpf->stack)) { |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5028
diff
changeset
|
909 |
DEBUG(ntp, 1, "Out of stack"); |
0 | 910 |
break; |
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
911 |
} |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
912 |
|
0 | 913 |
tpf->stack[tpf->nstack] = si; |
914 |
HeapifyUp(tpf); |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
915 |
}; |
0 | 916 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
917 |
/* If this is the first intersection, we need to fill the first_track member. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
918 |
* so the code outside knows which path is better. |
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
919 |
* also randomize the order in which we search through them. */ |
0 | 920 |
if (si.depth == 1) { |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
921 |
assert(tpf->nstack == 1 || tpf->nstack == 2 || tpf->nstack == 3); |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
922 |
if (tpf->nstack != 1) { |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
923 |
uint32 r = Random(); |
5733 | 924 |
if (r & 1) Swap(tpf->stack[0].track, tpf->stack[1].track); |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
925 |
if (tpf->nstack != 2) { |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
926 |
TrackdirByte t = tpf->stack[2].track; |
5733 | 927 |
if (r & 2) Swap(tpf->stack[0].track, t); |
928 |
if (r & 4) Swap(tpf->stack[1].track, t); |
|
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
929 |
tpf->stack[2].first_track = tpf->stack[2].track = t; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
930 |
} |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
931 |
tpf->stack[0].first_track = tpf->stack[0].track; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
932 |
tpf->stack[1].first_track = tpf->stack[1].track; |
0 | 933 |
} |
934 |
} |
|
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
935 |
|
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
936 |
/* Continue with the next from the queue... */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
937 |
} |
0 | 938 |
} |
939 |
||
940 |
||
6352
938ab8f48e5d
(svn r9391) -Documentation : correct Doxygen of comments and @file inclusion. Time for P and Q files
belugas
parents:
6248
diff
changeset
|
941 |
/** new pathfinder for trains. better and faster. */ |
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3267
diff
changeset
|
942 |
void NewTrainPathfind(TileIndex tile, TileIndex dest, RailTypeMask railtypes, DiagDirection direction, NTPEnumProc* enum_proc, void* data) |
0 | 943 |
{ |
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
944 |
NewTrackPathFinder tpf; |
0 | 945 |
|
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
946 |
tpf.dest = dest; |
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
947 |
tpf.userdata = data; |
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
948 |
tpf.enum_proc = enum_proc; |
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3267
diff
changeset
|
949 |
tpf.tracktype = TRANSPORT_RAIL; |
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3267
diff
changeset
|
950 |
tpf.railtypes = railtypes; |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2049
diff
changeset
|
951 |
tpf.maxlength = min(_patches.pf_maxlength * 3, 10000); |
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
952 |
tpf.nstack = 0; |
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
953 |
tpf.new_link = tpf.links; |
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
954 |
tpf.num_links_left = lengthof(tpf.links); |
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
955 |
memset(tpf.hash_head, 0, sizeof(tpf.hash_head)); |
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
956 |
|
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2006
diff
changeset
|
957 |
NTPEnum(&tpf, tile, direction); |
0 | 958 |
} |