summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ai/trolly/pathfinder.c2
-rw-r--r--elrail.c15
-rw-r--r--openttd.tgt901
-rw-r--r--os/os2/openttd.wpj4
-rw-r--r--rail.h2
-rw-r--r--strgen/strgen.c8
6 files changed, 506 insertions, 426 deletions
diff --git a/ai/trolly/pathfinder.c b/ai/trolly/pathfinder.c
index 3fc6cb170..241744afd 100644
--- a/ai/trolly/pathfinder.c
+++ b/ai/trolly/pathfinder.c
@@ -368,7 +368,7 @@ static void AyStar_AiPathFinder_GetNeighbours(AyStar *aystar, OpenListNode *curr
}
-extern uint GetRailFoundation(uint tileh, uint bits);
+extern uint GetRailFoundation(uint tileh, TrackBits bits);
extern uint GetRoadFoundation(uint tileh, uint bits);
extern uint GetBridgeFoundation(uint tileh, Axis); // XXX function declaration in .c
enum {
diff --git a/elrail.c b/elrail.c
index a429e8e9b..2f4671141 100644
--- a/elrail.c
+++ b/elrail.c
@@ -123,17 +123,26 @@ static void DrawCatenaryRailway(const TileInfo *ti)
TrackBits trackconfig[TS_END];
bool isflat[TS_END];
/* Note that ti->tileh has already been adjusted for Foundations */
- uint tileh[TS_END] = {ti->tileh, 0};
+ uint tileh[TS_END];
TLG tlg = GetTLG(ti->tile);
byte PCPstatus = 0;
byte OverridePCP = 0;
- byte PPPpreferred[DIAGDIR_END] = {0xFF, 0xFF, 0xFF, 0xFF};
- byte PPPallowed[DIAGDIR_END] = {AllowedPPPonPCP[0], AllowedPPPonPCP[1], AllowedPPPonPCP[2], AllowedPPPonPCP[3]};
+ byte PPPpreferred[DIAGDIR_END];
+ byte PPPallowed[DIAGDIR_END];
byte PPPbuffer[DIAGDIR_END];
DiagDirection i;
Track t;
+ tileh[0] = ti->tileh;
+ tileh[1] = 0;
+
+ PPPpreferred[0] = PPPpreferred[1] = PPPpreferred[2] = PPPpreferred[3] = 0xFF;
+ PPPallowed[0] = AllowedPPPonPCP[0];
+ PPPallowed[1] = AllowedPPPonPCP[1];
+ PPPallowed[2] = AllowedPPPonPCP[2];
+ PPPallowed[3] = AllowedPPPonPCP[3];
+
/* Find which rail bits are present, and select the override points.
We don't draw a pylon:
1) INSIDE a tunnel (we wouldn't see it anyway)
diff --git a/openttd.tgt b/openttd.tgt
index c552e69fc..7f38b30bb 100644
--- a/openttd.tgt
+++ b/openttd.tgt
@@ -151,7 +151,7 @@ OpenTTD
0
38
WVList
-4
+3
39
ActionStates
40
@@ -174,186 +174,189 @@ WVList
ActionStates
46
WString
-6
-&Debug
-47
-WVList
-0
-48
-ActionStates
-49
-WString
7
Sam&ple
-50
+47
WVList
0
-1
1
1
0
-51
+48
WPickList
-120
-52
+126
+49
MItem
3
*.c
-53
+50
WString
4
COBJ
-54
+51
WVList
-17
-55
+14
+52
MVState
-56
+53
WString
3
WCC
-57
+54
WString
28
?????Disable Warning message
1
-58
+55
WString
3
202
0
-59
+56
MVState
-60
+57
WString
3
WCC
-61
+58
WString
23
?????Macro definitions:
1
-62
+59
WString
50
ENABLE_NETWORK=1 WITH_ZLIB=1 WITH_PNG=1 WITH_SDL=1
0
-63
-MRState
-64
-WString
-3
-WCC
-65
-WString
-20
-?????Pack structures
-1
-0
-66
+60
MRState
-67
+61
WString
3
WCC
-68
+62
WString
21
?????4 byte alignment
1
1
-69
+63
MRState
-70
+64
WString
3
WCC
-71
+65
WString
21
?????No optimizations
1
0
-72
+66
MRState
-73
+67
WString
3
WCC
-74
+68
WString
24
?????Space optimizations
1
1
-75
+69
MRState
-76
+70
WString
3
WCC
-77
+71
WString
29
?????No debugging information
1
1
-78
+72
MRState
-79
+73
WString
3
WCC
-80
+74
WString
24
?????Full debugging info
1
0
-81
+75
MVState
-82
+76
WString
3
WCC
-83
+77
WString
28
?????Disable Warning message
0
-84
+78
WString
3
202
0
-85
+79
MVState
-86
+80
WString
3
WCC
-87
+81
WString
23
?????Macro definitions:
0
-88
+82
WString
61
ENABLE_NETWORK=1 WITH_ZLIB=1 WITH_PNG=1 WITH_SDL=1 WITH_REV=1
0
-89
+83
MCState
-90
+84
WString
3
WCC
-91
+85
WString
31
?????Force enums to be type int
0
1
+86
+MRState
+87
+WString
+3
+WCC
+88
+WString
+29
+?????No debugging information
+0
+1
+89
+MRState
+90
+WString
+3
+WCC
+91
+WString
+28
+?????Line number information
+0
+0
92
MRState
93
@@ -362,8 +365,8 @@ WString
WCC
94
WString
-20
-?????Pack structures
+39
+??2??Pentium Pro Register based calling
0
0
95
@@ -374,69 +377,75 @@ WString
WCC
97
WString
-27
-?????Default byte alignment
+36
+??2??Pentium Pro Stack based calling
0
1
98
-MRState
+WVList
+0
+-1
+1
+1
+0
99
-WString
-3
-WCC
+MItem
+7
+ai\ai.c
100
WString
-29
-?????No debugging information
-0
-1
+4
+COBJ
101
-MRState
+WVList
+0
102
-WString
-3
-WCC
-103
-WString
-28
-?????Line number information
+WVList
0
+49
+1
+1
0
+103
+MItem
+20
+ai\default\default.c
104
-MRState
-105
WString
-3
-WCC
+4
+COBJ
+105
+WVList
+0
106
-WString
-35
-??2??Pentium Register based calling
+WVList
0
+49
+1
+1
0
107
-MRState
+MItem
+17
+ai\trolly\build.c
108
WString
-3
-WCC
+4
+COBJ
109
-WString
-32
-??2??Pentium Stack based calling
+WVList
0
-1
110
WVList
0
--1
+49
1
1
0
111
MItem
-7
-ai\ai.c
+22
+ai\trolly\pathfinder.c
112
WString
4
@@ -447,14 +456,14 @@ WVList
114
WVList
0
-52
+49
1
1
0
115
MItem
-20
-ai\default\default.c
+18
+ai\trolly\shared.c
116
WString
4
@@ -465,14 +474,14 @@ WVList
118
WVList
0
-52
+49
1
1
0
119
MItem
-17
-ai\trolly\build.c
+18
+ai\trolly\trolly.c
120
WString
4
@@ -483,14 +492,14 @@ WVList
122
WVList
0
-52
+49
1
1
0
123
MItem
-22
-ai\trolly\pathfinder.c
+14
+aircraft_cmd.c
124
WString
4
@@ -501,14 +510,14 @@ WVList
126
WVList
0
-52
+49
1
1
0
127
MItem
-18
-ai\trolly\shared.c
+14
+aircraft_gui.c
128
WString
4
@@ -519,14 +528,14 @@ WVList
130
WVList
0
-52
+49
1
1
0
131
MItem
-18
-ai\trolly\trolly.c
+9
+airport.c
132
WString
4
@@ -537,14 +546,14 @@ WVList
134
WVList
0
-52
+49
1
1
0
135
MItem
-14
-aircraft_cmd.c
+13
+airport_gui.c
136
WString
4
@@ -555,14 +564,14 @@ WVList
138
WVList
0
-52
+49
1
1
0
139
MItem
-14
-aircraft_gui.c
+8
+aystar.c
140
WString
4
@@ -573,14 +582,14 @@ WVList
142
WVList
0
-52
+49
1
1
0
143
MItem
-9
-airport.c
+12
+bridge_gui.c
144
WString
4
@@ -591,14 +600,14 @@ WVList
146
WVList
0
-52
+49
1
1
0
147
MItem
-13
-airport_gui.c
+12
+bridge_map.c
148
WString
4
@@ -609,14 +618,14 @@ WVList
150
WVList
0
-52
+49
1
1
0
151
MItem
-8
-aystar.c
+16
+callback_table.c
152
WString
4
@@ -627,14 +636,14 @@ WVList
154
WVList
0
-52
+49
1
1
0
155
MItem
-12
-bridge_gui.c
+11
+clear_cmd.c
156
WString
4
@@ -645,14 +654,14 @@ WVList
158
WVList
0
-52
+49
1
1
0
159
MItem
-16
-callback_table.c
+9
+command.c
160
WString
4
@@ -663,14 +672,14 @@ WVList
162
WVList
0
-52
+49
1
1
0
163
MItem
-11
-clear_cmd.c
+9
+console.c
164
WString
4
@@ -681,14 +690,14 @@ WVList
166
WVList
0
-52
+49
1
1
0
167
MItem
-9
-command.c
+14
+console_cmds.c
168
WString
4
@@ -699,14 +708,14 @@ WVList
170
WVList
0
-52
+49
1
1
0
171
MItem
-9
-console.c
+10
+currency.c
172
WString
4
@@ -717,14 +726,14 @@ WVList
174
WVList
0
-52
+49
1
1
0
175
MItem
-14
-console_cmds.c
+7
+debug.c
176
WString
4
@@ -735,14 +744,14 @@ WVList
178
WVList
0
-52
+49
1
1
0
179
MItem
-10
-currency.c
+11
+dedicated.c
180
WString
4
@@ -753,14 +762,14 @@ WVList
182
WVList
0
-52
+49
1
1
0
183
MItem
7
-debug.c
+depot.c
184
WString
4
@@ -771,14 +780,14 @@ WVList
186
WVList
0
-52
+49
1
1
0
187
MItem
-11
-dedicated.c
+14
+disaster_cmd.c
188
WString
4
@@ -789,14 +798,14 @@ WVList
190
WVList
0
-52
+49
1
1
0
191
MItem
-7
-depot.c
+10
+dock_gui.c
192
WString
4
@@ -807,14 +816,14 @@ WVList
194
WVList
0
-52
+49
1
1
0
195
MItem
-14
-disaster_cmd.c
+8
+driver.c
196
WString
4
@@ -825,14 +834,14 @@ WVList
198
WVList
0
-52
+49
1
1
0
199
MItem
-10
-dock_gui.c
+12
+dummy_land.c
200
WString
4
@@ -843,14 +852,14 @@ WVList
202
WVList
0
-52
+49
1
1
0
203
MItem
-8
-driver.c
+9
+economy.c
204
WString
4
@@ -861,14 +870,14 @@ WVList
206
WVList
0
-52
+49
1
1
0
207
MItem
-12
-dummy_land.c
+8
+elrail.c
208
WString
4
@@ -879,14 +888,14 @@ WVList
210
WVList
0
-52
+49
1
1
0
211
MItem
-9
-economy.c
+8
+engine.c
212
WString
4
@@ -897,14 +906,14 @@ WVList
214
WVList
0
-52
+49
1
1
0
215
MItem
-8
-engine.c
+12
+engine_gui.c
216
WString
4
@@ -915,14 +924,14 @@ WVList
218
WVList
0
-52
+49
1
1
0
219
MItem
-12
-engine_gui.c
+8
+fileio.c
220
WString
4
@@ -933,14 +942,14 @@ WVList
222
WVList
0
-52
+49
1
1
0
223
MItem
-8
-fileio.c
+5
+gfx.c
224
WString
4
@@ -951,14 +960,14 @@ WVList
226
WVList
0
-52
+49
1
1
0
227
MItem
-5
-gfx.c
+9
+gfxinit.c
228
WString
4
@@ -969,14 +978,14 @@ WVList
230
WVList
0
-52
+49
1
1
0
231
MItem
-9
-gfxinit.c
+11
+graph_gui.c
232
WString
4
@@ -987,14 +996,14 @@ WVList
234
WVList
0
-52
+49
1
1
0
235
MItem
-11
-graph_gui.c
+14
+industry_cmd.c
236
WString
4
@@ -1005,14 +1014,14 @@ WVList
238
WVList
0
-52
+49
1
1
0
239
MItem
14
-industry_cmd.c
+industry_gui.c
240
WString
4
@@ -1023,14 +1032,14 @@ WVList
242
WVList
0
-52
+49
1
1
0
243
MItem
-14
-industry_gui.c
+11
+intro_gui.c
244
WString
4
@@ -1041,14 +1050,14 @@ WVList
246
WVList
0
-52
+49
1
1
0
247
MItem
11
-intro_gui.c
+landscape.c
248
WString
4
@@ -1059,14 +1068,14 @@ WVList
250
WVList
0
-52
+49
1
1
0
251
MItem
-11
-landscape.c
+10
+main_gui.c
252
WString
4
@@ -1077,14 +1086,14 @@ WVList
254
WVList
0
-52
+49
1
1
0
255
MItem
-10
-main_gui.c
+5
+map.c
256
WString
4
@@ -1095,14 +1104,14 @@ WVList
258
WVList
0
-52
+49
1
1
0
259
MItem
5
-map.c
+md5.c
260
WString
4
@@ -1113,14 +1122,14 @@ WVList
262
WVList
0
-52
+49
1
1
0
263
MItem
-5
-md5.c
+10
+mersenne.c
264
WString
4
@@ -1131,7 +1140,7 @@ WVList
266
WVList
0
-52
+49
1
1
0
@@ -1149,7 +1158,7 @@ WVList
270
WVList
0
-52
+49
1
1
0
@@ -1167,7 +1176,7 @@ WVList
274
WVList
0
-52
+49
1
1
0
@@ -1185,7 +1194,7 @@ WVList
278
WVList
0
-52
+49
1
1
0
@@ -1203,7 +1212,7 @@ WVList
282
WVList
0
-52
+49
1
1
0
@@ -1221,7 +1230,7 @@ WVList
286
WVList
0
-52
+49
1
1
0
@@ -1239,7 +1248,7 @@ WVList
290
WVList
0
-52
+49
1
1
0
@@ -1257,7 +1266,7 @@ WVList
294
WVList
0
-52
+49
1
1
0
@@ -1275,7 +1284,7 @@ WVList
298
WVList
0
-52
+49
1
1
0
@@ -1293,7 +1302,7 @@ WVList
302
WVList
0
-52
+49
1
1
0
@@ -1311,7 +1320,7 @@ WVList
306
WVList
0
-52
+49
1
1
0
@@ -1329,7 +1338,7 @@ WVList
310
WVList
0
-52
+49
1
1
0
@@ -1347,7 +1356,7 @@ WVList
314
WVList
0
-52
+49
1
1
0
@@ -1365,7 +1374,7 @@ WVList
318
WVList
0
-52
+49
1
1
0
@@ -1383,7 +1392,7 @@ WVList
322
WVList
0
-52
+49
1
1
0
@@ -1401,7 +1410,7 @@ WVList
326
WVList
0
-52
+49
1
1
0
@@ -1419,7 +1428,7 @@ WVList
330
WVList
0
-52
+49
1
1
0
@@ -1437,14 +1446,14 @@ WVList
334
WVList
0
-52
+49
1
1
0
335
MItem
-10
-news_gui.c
+15
+newgrf_engine.c
336
WString
4
@@ -1455,14 +1464,14 @@ WVList
338
WVList
0
-52
+49
1
1
0
339
MItem
-5
-npf.c
+16
+newgrf_station.c
340
WString
4
@@ -1473,14 +1482,14 @@ WVList
342
WVList
0
-52
+49
1
1
0
343
MItem
-11
-oldloader.c
+10
+news_gui.c
344
WString
4
@@ -1491,14 +1500,14 @@ WVList
346
WVList
0
-52
+49
1
1
0
347
MItem
-9
-openttd.c
+5
+npf.c
348
WString
4
@@ -1509,14 +1518,14 @@ WVList
350
WVList
0
-52
+49
1
1
0
351
MItem
11
-order_cmd.c
+oldloader.c
352
WString
4
@@ -1527,14 +1536,14 @@ WVList
354
WVList
0
-52
+49
1
1
0
355
MItem
-11
-order_gui.c
+9
+openttd.c
356
WString
4
@@ -1545,14 +1554,14 @@ WVList
358
WVList
0
-52
+49
1
1
0
359
MItem
-5
-os2.c
+11
+order_cmd.c
360
WString
4
@@ -1563,14 +1572,14 @@ WVList
362
WVList
0
-52
+49
1
1
0
363
MItem
-10
-pathfind.c
+11
+order_gui.c
364
WString
4
@@ -1581,14 +1590,14 @@ WVList
366
WVList
0
-52
+49
1
1
0
367
MItem
5
-pbs.c
+os2.c
368
WString
4
@@ -1599,14 +1608,14 @@ WVList
370
WVList
0
-52
+49
1
1
0
371
MItem
-12
-player_gui.c
+10
+pathfind.c
372
WString
4
@@ -1617,14 +1626,14 @@ WVList
374
WVList
0
-52
+49
1
1
0
375
MItem
-9
-players.c
+12
+player_gui.c
376
WString
4
@@ -1635,14 +1644,14 @@ WVList
378
WVList
0
-52
+49
1
1
0
379
MItem
-6
-pool.c
+9
+players.c
380
WString
4
@@ -1653,14 +1662,14 @@ WVList
382
WVList
0
-52
+49
1
1
0
383
MItem
-7
-queue.c
+6
+pool.c
384
WString
4
@@ -1671,14 +1680,14 @@ WVList
386
WVList
0
-52
+49
1
1
0
387
MItem
-6
-rail.c
+7
+queue.c
388
WString
4
@@ -1689,14 +1698,14 @@ WVList
390
WVList
0
-52
+49
1
1
0
391
MItem
-10
-rail_cmd.c
+6
+rail.c
392
WString
4
@@ -1707,14 +1716,14 @@ WVList
394
WVList
0
-52
+49
1
1
0
395
MItem
10
-rail_gui.c
+rail_cmd.c
396
WString
4
@@ -1725,14 +1734,14 @@ WVList
398
WVList
0
-52
+49
1
1
0
399
MItem
-5
-rev.c
+10
+rail_gui.c
400
WString
4
@@ -1742,42 +1751,42 @@ WVList
0
402
WVList
-1
-403
-ActionStates
-404
-WString
-5
-&Make
-405
-WVList
0
-52
+49
1
1
0
-406
+403
MItem
-10
-road_cmd.c
-407
+5
+rev.c
+404
WString
4
COBJ
-408
+405
WVList
0
+406
+WVList
+1
+407
+ActionStates
+408
+WString
+5
+&Make
409
WVList
0
-52
+49
1
1
0
410
MItem
10
-road_gui.c
+road_cmd.c
411
WString
4
@@ -1788,14 +1797,14 @@ WVList
413
WVList
0
-52
+49
1
1
0
414
MItem
-13
-roadveh_cmd.c
+10
+road_gui.c
415
WString
4
@@ -1806,14 +1815,14 @@ WVList
417
WVList
0
-52
+49
1
1
0
418
MItem
-13
-roadveh_gui.c
+10
+road_map.c
419
WString
4
@@ -1824,14 +1833,14 @@ WVList
421
WVList
0
-52
+49
1
1
0
422
MItem
-10
-saveload.c
+13
+roadveh_cmd.c
423
WString
4
@@ -1842,14 +1851,14 @@ WVList
425
WVList
0
-52
+49
1
1
0
426
MItem
-12
-screenshot.c
+13
+roadveh_gui.c
427
WString
4
@@ -1860,14 +1869,14 @@ WVList
429
WVList
0
-52
+49
1
1
0
430
MItem
-5
-sdl.c
+10
+saveload.c
431
WString
4
@@ -1878,14 +1887,14 @@ WVList
433
WVList
0
-52
+49
1
1
0
434
MItem
-10
-settings.c
+12
+screenshot.c
435
WString
4
@@ -1896,14 +1905,14 @@ WVList
437
WVList
0
-52
+49
1
1
0
438
MItem
-14
-settings_gui.c
+5
+sdl.c
439
WString
4
@@ -1914,14 +1923,14 @@ WVList
441
WVList
0
-52
+49
1
1
0
442
MItem
10
-ship_cmd.c
+settings.c
443
WString
4
@@ -1932,14 +1941,14 @@ WVList
445
WVList
0
-52
+49
1
1
0
446
MItem
-10
-ship_gui.c
+14
+settings_gui.c
447
WString
4
@@ -1950,14 +1959,14 @@ WVList
449
WVList
0
-52
+49
1
1
0
450
MItem
-7
-signs.c
+10
+ship_cmd.c
451
WString
4
@@ -1968,14 +1977,14 @@ WVList
453
WVList
0
-52
+49
1
1
0
454
MItem
-14
-smallmap_gui.c
+10
+ship_gui.c
455
WString
4
@@ -1986,14 +1995,14 @@ WVList
457
WVList
0
-52
+49
1
1
0
458
MItem
7
-sound.c
+signs.c
459
WString
4
@@ -2004,14 +2013,14 @@ WVList
461
WVList
0
-52
+49
1
1
0
462
MItem
14
-sound\null_s.c
+smallmap_gui.c
463
WString
4
@@ -2022,14 +2031,14 @@ WVList
465
WVList
0
-52
+49
1
1
0
466
MItem
-13
-sound\sdl_s.c
+7
+sound.c
467
WString
4
@@ -2040,14 +2049,14 @@ WVList
469
WVList
0
-52
+49
1
1
0
470
MItem
-8
-sprite.c
+14
+sound\null_s.c
471
WString
4
@@ -2058,14 +2067,14 @@ WVList
473
WVList
0
-52
+49
1
1
0
474
MItem
13
-spritecache.c
+sound\sdl_s.c
475
WString
4
@@ -2076,14 +2085,14 @@ WVList
477
WVList
0
-52
+49
1
1
0
478
MItem
-13
-station_cmd.c
+8
+sprite.c
479
WString
4
@@ -2094,14 +2103,14 @@ WVList
481
WVList
0
-52
+49
1
1
0
482
MItem
13
-station_gui.c
+spritecache.c
483
WString
4
@@ -2112,14 +2121,14 @@ WVList
485
WVList
0
-52
+49
1
1
0
486
MItem
-16
-station_newgrf.c
+13
+station_cmd.c
487
WString
4
@@ -2130,14 +2139,14 @@ WVList
489
WVList
0
-52
+49
1
1
0
490
MItem
-8
-StdAfx.c
+13
+station_gui.c
491
WString
4
@@ -2148,14 +2157,14 @@ WVList
493
WVList
0
-52
+49
1
1
0
494
MItem
-8
-string.c
+13
+station_map.c
495
WString
4
@@ -2166,14 +2175,14 @@ WVList
497
WVList
0
-52
+49
1
1
0
498
MItem
-9
-strings.c
+8
+StdAfx.c
499
WString
4
@@ -2184,14 +2193,14 @@ WVList
501
WVList
0
-52
+49
1
1
0
502
MItem
-13
-subsidy_gui.c
+8
+string.c
503
WString
4
@@ -2202,14 +2211,14 @@ WVList
505
WVList
0
-52
+49
1
1
0
506
MItem
-15
-terraform_gui.c
+9
+strings.c
507
WString
4
@@ -2220,14 +2229,14 @@ WVList
509
WVList
0
-52
+49
1
1
0
510
MItem
-9
-texteff.c
+13
+subsidy_gui.c
511
WString
4
@@ -2238,14 +2247,14 @@ WVList
513
WVList
0
-52
+49
1
1
0
514
MItem
-8
-thread.c
+15
+terraform_gui.c
515
WString
4
@@ -2256,14 +2265,14 @@ WVList
517
WVList
0
-52
+49
1
1
0
518
MItem
-6
-tile.c
+9
+texteff.c
519
WString
4
@@ -2274,14 +2283,14 @@ WVList
521
WVList
0
-52
+49
1
1
0
522
MItem
-10
-town_cmd.c
+8
+thread.c
523
WString
4
@@ -2292,14 +2301,14 @@ WVList
525
WVList
0
-52
+49
1
1
0
526
MItem
-10
-town_gui.c
+6
+tile.c
527
WString
4
@@ -2310,14 +2319,14 @@ WVList
529
WVList
0
-52
+49
1
1
0
530
MItem
-11
-train_cmd.c
+10
+town_cmd.c
531
WString
4
@@ -2328,14 +2337,14 @@ WVList
533
WVList
0
-52
+49
1
1
0
534
MItem
-11
-train_gui.c
+10
+town_gui.c
535
WString
4
@@ -2346,14 +2355,14 @@ WVList
537
WVList
0
-52
+49
1
1
0
538
MItem
-10
-tree_cmd.c
+11
+train_cmd.c
539
WString
4
@@ -2364,14 +2373,14 @@ WVList
541
WVList
0
-52
+49
1
1
0
542
MItem
-18
-tunnelbridge_cmd.c
+11
+train_gui.c
543
WString
4
@@ -2382,14 +2391,14 @@ WVList
545
WVList
0
-52
+49
1
1
0
546
MItem
-15
-unmovable_cmd.c
+10
+tree_cmd.c
547
WString
4
@@ -2400,14 +2409,14 @@ WVList
549
WVList
0
-52
+49
1
1
0
550
MItem
-9
-vehicle.c
+12
+tunnel_map.c
551
WString
4
@@ -2418,14 +2427,14 @@ WVList
553
WVList
0
-52
+49
1
1
0
554
MItem
-13
-vehicle_gui.c
+18
+tunnelbridge_cmd.c
555
WString
4
@@ -2436,14 +2445,14 @@ WVList
557
WVList
0
-52
+49
1
1
0
558
MItem
-19
-video\dedicated_v.c
+15
+unmovable_cmd.c
559
WString
4
@@ -2454,14 +2463,14 @@ WVList
561
WVList
0
-52
+49
1
1
0
562
MItem
-14
-video\null_v.c
+9
+vehicle.c
563
WString
4
@@ -2472,14 +2481,14 @@ WVList
565
WVList
0
-52
+49
1
1
0
566
MItem
13
-video\sdl_v.c
+vehicle_gui.c
567
WString
4
@@ -2490,14 +2499,14 @@ WVList
569
WVList
0
-52
+49
1
1
0
570
MItem
-10
-viewport.c
+19
+video\dedicated_v.c
571
WString
4
@@ -2508,14 +2517,14 @@ WVList
573
WVList
0
-52
+49
1
1
0
574
MItem
-11
-water_cmd.c
+14
+video\null_v.c
575
WString
4
@@ -2526,14 +2535,14 @@ WVList
577
WVList
0
-52
+49
1
1
0
578
MItem
-10
-waypoint.c
+13
+video\sdl_v.c
579
WString
4
@@ -2544,14 +2553,14 @@ WVList
581
WVList
0
-52
+49
1
1
0
582
MItem
-8
-widget.c
+10
+viewport.c
583
WString
4
@@ -2562,14 +2571,14 @@ WVList
585
WVList
0
-52
+49
1
1
0
586
MItem
-8
-window.c
+11
+water_cmd.c
587
WString
4
@@ -2580,7 +2589,61 @@ WVList
589
WVList
0
-52
+49
+1
+1
+0
+590
+MItem
+10
+waypoint.c
+591
+WString
+4
+COBJ
+592
+WVList
+0
+593
+WVList
+0
+49
+1
+1
+0
+594
+MItem
+8
+widget.c
+595
+WString
+4
+COBJ
+596
+WVList
+0
+597
+WVList
+0
+49
+1
+1
+0
+598
+MItem
+8
+window.c
+599
+WString
+4
+COBJ
+600
+WVList
+0
+601
+WVList
+0
+49
1
1
0
diff --git a/os/os2/openttd.wpj b/os/os2/openttd.wpj
index dcfa01988..61b2caa55 100644
--- a/os/os2/openttd.wpj
+++ b/os/os2/openttd.wpj
@@ -4,8 +4,8 @@ projectIdent
VpeMain
1
WRect
--32
--40
+0
+0
10304
10020
2
diff --git a/rail.h b/rail.h
index e7c5f3413..12dbe4f61 100644
--- a/rail.h
+++ b/rail.h
@@ -512,5 +512,5 @@ void DrawDefaultWaypointSprite(int x, int y, RailType railtype);
*/
void DrawCatenary(const TileInfo *ti);
-uint GetRailFoundation(uint tileh, uint bits);
+uint GetRailFoundation(uint tileh, TrackBits bits);
#endif /* RAIL_H */
diff --git a/strgen/strgen.c b/strgen/strgen.c
index 67fd1be5a..9ae091a88 100644
--- a/strgen/strgen.c
+++ b/strgen/strgen.c
@@ -20,6 +20,14 @@
#define stderr stdout
#endif // __MORPHOS__
+#ifdef __WATCOMC__
+ uint _map_log_x; // an unpleasant hack required because Watcom is insisting on
+ uint _map_size_x; // these variables being valid references in map.h
+ uint _map_size_y;
+ uint _map_tile_mask;
+ uint _map_size;
+#endif
+
/* Compiles a list of strings into a compiled string list */
typedef void (*ParseCmdProc)(char *buf, int value);
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-24 13:01:15 +0000