--- a/docs/Readme_OS2.txt	Sun Mar 26 18:49:31 2006 +0000
+++ b/docs/Readme_OS2.txt	Fri Mar 31 16:19:16 2006 +0000
@@ -15,15 +15,13 @@
 
 SDL.DLL (SDL 1.2.7) and FSLib.dll are required to use this program:
 these can be downloaded from the Files section at
-http://sourceforge.net/projects/openttd/ - see "os2-useful.zip".
-(Note that a newer version of SDL is now available at
-ftp://ftp.netlabs.org/pub/sdl/sdl-dev-os2-2004-12-22.zip which may
-help solve some problems).
+http://sourceforge.net/projects/openttd/ - see "os2-useful-v1.1.zip".
+Version 20051222 of SDL or later is required. This can be found at
+http://sdl.netlabs.org/.
 
-Please note that SDL release 2005-03-30 does NOT work with OpenTTD,
-at least in my experience and the experience of a couple of other
-users. If you experience problems with OpenTTD, please try downgrading
-to SDL 2004-12-22.
+Please note that earlier SDL releases will probably NOT work with
+OpenTTD. If you experience problems with OpenTTD, please check
+your SDL and FSLib.dll versions (both must match).
 
 Note that to actually play the game, I have found in my own
 experience that a version of the Scitech Display Drivers or its later
@@ -96,13 +94,12 @@
   http://www.libpng.org/ - contains an EMX/gcc makefile, ignore this
 
 - SDL for OS/2
-  For 0.3.5, I used ftp://ftp.netlabs.org/pub/sdl/SDL-1.2.7-src-20040908a.zip -
-  take SDL.dll and SDL.lib from the src/ directory. Note that 20041222 is
-  out now, which is recommended for stability updates.
+  ftp://ftp.netlabs.org/pub/sdl/sdl-1.2.7-src-20051222.zip used for
+  0.4.7
 
 If you do not wish to build the libraries yourself, pre-built versions
 can be downloaded from the Files section at
-http://sourceforge.net/projects/openttd/ - see "os2-useful.zip".
+http://sourceforge.net/projects/openttd/ - see "os2-useful-v1.1.zip".
 
 A Note About Subversion Revision Numbers
 ----------------------------------------

--- a/openttd.tgt	Sun Mar 26 18:49:31 2006 +0000
+++ b/openttd.tgt	Fri Mar 31 16:19:16 2006 +0000
@@ -151,7 +151,7 @@
 0
 38
 WVList
-4
+3
 39
 ActionStates
 40
@@ -174,70 +174,73 @@
 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
+119
+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
+60
+MRState
+61
+WString
+3
+WCC
+62
+WString
+21
+?????4 byte alignment
+1
+1
 63
 MRState
 64
@@ -246,8 +249,8 @@
 WCC
 65
 WString
-20
-?????Pack structures
+21
+?????No optimizations
 1
 0
 66
@@ -258,8 +261,8 @@
 WCC
 68
 WString
-21
-?????4 byte alignment
+24
+?????Space optimizations
 1
 1
 69
@@ -270,10 +273,10 @@
 WCC
 71
 WString
-21
-?????No optimizations
+29
+?????No debugging information
 1
-0
+1
 72
 MRState
 73
@@ -283,77 +286,77 @@
 74
 WString
 24
-?????Space optimizations
+?????Full debugging info
 1
-1
+0
 75
-MRState
+MVState
 76
 WString
 3
 WCC
 77
 WString
-29
-?????No debugging information
-1
-1
-78
-MRState
-79
-WString
-3
-WCC
-80
-WString
-24
-?????Full debugging info
-1
-0
-81
-MVState
-82
-WString
-3
-WCC
-83
-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
+83
+MCState
+84
+WString
+3
+WCC
+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
-MCState
+MRState
 90
 WString
 3
 WCC
 91
 WString
-31
-?????Force enums to be type int
+28
+?????Line number information
 0
-1
+0
 92
 MRState
 93
@@ -362,8 +365,8 @@
 WCC
 94
 WString
-20
-?????Pack structures
+39
+??2??Pentium Pro Register based calling
 0
 0
 95
@@ -374,69 +377,75 @@
 WCC
 97
 WString
-27
-?????Default byte alignment
+36
+??2??Pentium Pro Stack based calling
 0
 1
 98
-MRState
-99
-WString
-3
-WCC
-100
-WString
-29
-?????No debugging information
-0
-1
-101
-MRState
-102
-WString
-3
-WCC
-103
-WString
-28
-?????Line number information
-0
-0
-104
-MRState
-105
-WString
-3
-WCC
-106
-WString
-35
-??2??Pentium Register based calling
-0
-0
-107
-MRState
-108
-WString
-3
-WCC
-109
-WString
-32
-??2??Pentium Stack based calling
-0
-1
-110
 WVList
 0
 -1
 1
 1
 0
-111
+99
 MItem
 7
 ai\ai.c
+100
+WString
+4
+COBJ
+101
+WVList
+0
+102
+WVList
+0
+49
+1
+1
+0
+103
+MItem
+20
+ai\default\default.c
+104
+WString
+4
+COBJ
+105
+WVList
+0
+106
+WVList
+0
+49
+1
+1
+0
+107
+MItem
+17
+ai\trolly\build.c
+108
+WString
+4
+COBJ
+109
+WVList
+0
+110
+WVList
+0
+49
+1
+1
+0
+111
+MItem
+22
+ai\trolly\pathfinder.c
 112
 WString
 4
@@ -447,14 +456,14 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 138
 WVList
 0
-52
+49
 1
 1
 0
 139
 MItem
-14
-aircraft_gui.c
+8
+aystar.c
 140
 WString
 4
@@ -573,14 +582,14 @@
 142
 WVList
 0
-52
+49
 1
 1
 0
 143
 MItem
-9
-airport.c
+12
+bridge_gui.c
 144
 WString
 4
@@ -591,14 +600,14 @@
 146
 WVList
 0
-52
+49
 1
 1
 0
 147
 MItem
-13
-airport_gui.c
+16
+callback_table.c
 148
 WString
 4
@@ -609,14 +618,14 @@
 150
 WVList
 0
-52
+49
 1
 1
 0
 151
 MItem
-8
-aystar.c
+11
+clear_cmd.c
 152
 WString
 4
@@ -627,14 +636,14 @@
 154
 WVList
 0
-52
+49
 1
 1
 0
 155
 MItem
-12
-bridge_gui.c
+9
+command.c
 156
 WString
 4
@@ -645,14 +654,14 @@
 158
 WVList
 0
-52
+49
 1
 1
 0
 159
 MItem
-16
-callback_table.c
+9
+console.c
 160
 WString
 4
@@ -663,14 +672,14 @@
 162
 WVList
 0
-52
+49
 1
 1
 0
 163
 MItem
-11
-clear_cmd.c
+14
+console_cmds.c
 164
 WString
 4
@@ -681,14 +690,14 @@
 166
 WVList
 0
-52
+49
 1
 1
 0
 167
 MItem
-9
-command.c
+10
+currency.c
 168
 WString
 4
@@ -699,14 +708,14 @@
 170
 WVList
 0
-52
+49
 1
 1
 0
 171
 MItem
-9
-console.c
+7
+debug.c
 172
 WString
 4
@@ -717,14 +726,14 @@
 174
 WVList
 0
-52
+49
 1
 1
 0
 175
 MItem
-14
-console_cmds.c
+11
+dedicated.c
 176
 WString
 4
@@ -735,14 +744,14 @@
 178
 WVList
 0
-52
+49
 1
 1
 0
 179
 MItem
-10
-currency.c
+7
+depot.c
 180
 WString
 4
@@ -753,14 +762,14 @@
 182
 WVList
 0
-52
+49
 1
 1
 0
 183
 MItem
-7
-debug.c
+14
+disaster_cmd.c
 184
 WString
 4
@@ -771,14 +780,14 @@
 186
 WVList
 0
-52
+49
 1
 1
 0
 187
 MItem
-11
-dedicated.c
+10
+dock_gui.c
 188
 WString
 4
@@ -789,14 +798,14 @@
 190
 WVList
 0
-52
+49
 1
 1
 0
 191
 MItem
-7
-depot.c
+8
+driver.c
 192
 WString
 4
@@ -807,14 +816,14 @@
 194
 WVList
 0
-52
+49
 1
 1
 0
 195
 MItem
-14
-disaster_cmd.c
+12
+dummy_land.c
 196
 WString
 4
@@ -825,14 +834,14 @@
 198
 WVList
 0
-52
+49
 1
 1
 0
 199
 MItem
-10
-dock_gui.c
+9
+economy.c
 200
 WString
 4
@@ -843,14 +852,14 @@
 202
 WVList
 0
-52
+49
 1
 1
 0
 203
 MItem
 8
-driver.c
+engine.c
 204
 WString
 4
@@ -861,14 +870,14 @@
 206
 WVList
 0
-52
+49
 1
 1
 0
 207
 MItem
 12
-dummy_land.c
+engine_gui.c
 208
 WString
 4
@@ -879,14 +888,14 @@
 210
 WVList
 0
-52
+49
 1
 1
 0
 211
 MItem
-9
-economy.c
+8
+fileio.c
 212
 WString
 4
@@ -897,14 +906,14 @@
 214
 WVList
 0
-52
+49
 1
 1
 0
 215
 MItem
-8
-engine.c
+5
+gfx.c
 216
 WString
 4
@@ -915,14 +924,14 @@
 218
 WVList
 0
-52
+49
 1
 1
 0
 219
 MItem
-12
-engine_gui.c
+9
+gfxinit.c
 220
 WString
 4
@@ -933,14 +942,14 @@
 222
 WVList
 0
-52
+49
 1
 1
 0
 223
 MItem
-8
-fileio.c
+11
+graph_gui.c
 224
 WString
 4
@@ -951,14 +960,14 @@
 226
 WVList
 0
-52
+49
 1
 1
 0
 227
 MItem
-5
-gfx.c
+14
+industry_cmd.c
 228
 WString
 4
@@ -969,14 +978,14 @@
 230
 WVList
 0
-52
+49
 1
 1
 0
 231
 MItem
-9
-gfxinit.c
+14
+industry_gui.c
 232
 WString
 4
@@ -987,14 +996,14 @@
 234
 WVList
 0
-52
+49
 1
 1
 0
 235
 MItem
 11
-graph_gui.c
+intro_gui.c
 236
 WString
 4
@@ -1005,14 +1014,14 @@
 238
 WVList
 0
-52
+49
 1
 1
 0
 239
 MItem
-14
-industry_cmd.c
+11
+landscape.c
 240
 WString
 4
@@ -1023,14 +1032,14 @@
 242
 WVList
 0
-52
+49
 1
 1
 0
 243
 MItem
-14
-industry_gui.c
+10
+main_gui.c
 244
 WString
 4
@@ -1041,14 +1050,14 @@
 246
 WVList
 0
-52
+49
 1
 1
 0
 247
 MItem
-11
-intro_gui.c
+5
+map.c
 248
 WString
 4
@@ -1059,14 +1068,14 @@
 250
 WVList
 0
-52
+49
 1
 1
 0
 251
 MItem
-11
-landscape.c
+5
+md5.c
 252
 WString
 4
@@ -1077,14 +1086,14 @@
 254
 WVList
 0
-52
+49
 1
 1
 0
 255
 MItem
-10
-main_gui.c
+9
+minilzo.c
 256
 WString
 4
@@ -1095,14 +1104,14 @@
 258
 WVList
 0
-52
+49
 1
 1
 0
 259
 MItem
-5
-map.c
+6
+misc.c
 260
 WString
 4
@@ -1113,14 +1122,14 @@
 262
 WVList
 0
-52
+49
 1
 1
 0
 263
 MItem
-5
-md5.c
+10
+misc_cmd.c
 264
 WString
 4
@@ -1131,14 +1140,14 @@
 266
 WVList
 0
-52
+49
 1
 1
 0
 267
 MItem
-9
-minilzo.c
+10
+misc_gui.c
 268
 WString
 4
@@ -1149,14 +1158,14 @@
 270
 WVList
 0
-52
+49
 1
 1
 0
 271
 MItem
-6
-misc.c
+7
+mixer.c
 272
 WString
 4
@@ -1167,14 +1176,14 @@
 274
 WVList
 0
-52
+49
 1
 1
 0
 275
 MItem
-10
-misc_cmd.c
+14
+music\null_m.c
 276
 WString
 4
@@ -1185,14 +1194,14 @@
 278
 WVList
 0
-52
+49
 1
 1
 0
 279
 MItem
-10
-misc_gui.c
+13
+music\os2_m.c
 280
 WString
 4
@@ -1203,14 +1212,14 @@
 282
 WVList
 0
-52
+49
 1
 1
 0
 283
 MItem
-7
-mixer.c
+11
+music_gui.c
 284
 WString
 4
@@ -1221,14 +1230,14 @@
 286
 WVList
 0
-52
+49
 1
 1
 0
 287
 MItem
-14
-music\null_m.c
+9
+namegen.c
 288
 WString
 4
@@ -1239,14 +1248,14 @@
 290
 WVList
 0
-52
+49
 1
 1
 0
 291
 MItem
-13
-music\os2_m.c
+9
+network.c
 292
 WString
 4
@@ -1257,14 +1266,14 @@
 294
 WVList
 0
-52
+49
 1
 1
 0
 295
 MItem
-11
-music_gui.c
+16
+network_client.c
 296
 WString
 4
@@ -1275,14 +1284,14 @@
 298
 WVList
 0
-52
+49
 1
 1
 0
 299
 MItem
-9
-namegen.c
+14
+network_data.c
 300
 WString
 4
@@ -1293,14 +1302,14 @@
 302
 WVList
 0
-52
+49
 1
 1
 0
 303
 MItem
-9
-network.c
+18
+network_gamelist.c
 304
 WString
 4
@@ -1311,14 +1320,14 @@
 306
 WVList
 0
-52
+49
 1
 1
 0
 307
 MItem
-16
-network_client.c
+13
+network_gui.c
 308
 WString
 4
@@ -1329,14 +1338,14 @@
 310
 WVList
 0
-52
+49
 1
 1
 0
 311
 MItem
-14
-network_data.c
+16
+network_server.c
 312
 WString
 4
@@ -1347,14 +1356,14 @@
 314
 WVList
 0
-52
+49
 1
 1
 0
 315
 MItem
-18
-network_gamelist.c
+13
+network_udp.c
 316
 WString
 4
@@ -1365,14 +1374,14 @@
 318
 WVList
 0
-52
+49
 1
 1
 0
 319
 MItem
-13
-network_gui.c
+8
+newgrf.c
 320
 WString
 4
@@ -1383,14 +1392,14 @@
 322
 WVList
 0
-52
+49
 1
 1
 0
 323
 MItem
-16
-network_server.c
+10
+news_gui.c
 324
 WString
 4
@@ -1401,14 +1410,14 @@
 326
 WVList
 0
-52
+49
 1
 1
 0
 327
 MItem
-13
-network_udp.c
+5
+npf.c
 328
 WString
 4
@@ -1419,14 +1428,14 @@
 330
 WVList
 0
-52
+49
 1
 1
 0
 331
 MItem
-8
-newgrf.c
+11
+oldloader.c
 332
 WString
 4
@@ -1437,14 +1446,14 @@
 334
 WVList
 0
-52
+49
 1
 1
 0
 335
 MItem
-10
-news_gui.c
+9
+openttd.c
 336
 WString
 4
@@ -1455,14 +1464,14 @@
 338
 WVList
 0
-52
+49
 1
 1
 0
 339
 MItem
-5
-npf.c
+11
+order_cmd.c
 340
 WString
 4
@@ -1473,14 +1482,14 @@
 342
 WVList
 0
-52
+49
 1
 1
 0
 343
 MItem
 11
-oldloader.c
+order_gui.c
 344
 WString
 4
@@ -1491,14 +1500,14 @@
 346
 WVList
 0
-52
+49
 1
 1
 0
 347
 MItem
-9
-openttd.c
+5
+os2.c
 348
 WString
 4
@@ -1509,14 +1518,14 @@
 350
 WVList
 0
-52
+49
 1
 1
 0
 351
 MItem
-11
-order_cmd.c
+10
+pathfind.c
 352
 WString
 4
@@ -1527,14 +1536,14 @@
 354
 WVList
 0
-52
+49
 1
 1
 0
 355
 MItem
-11
-order_gui.c
+12
+player_gui.c
 356
 WString
 4
@@ -1545,14 +1554,14 @@
 358
 WVList
 0
-52
+49
 1
 1
 0
 359
 MItem
-5
-os2.c
+9
+players.c
 360
 WString
 4
@@ -1563,14 +1572,14 @@
 362
 WVList
 0
-52
+49
 1
 1
 0
 363
 MItem
-10
-pathfind.c
+6
+pool.c
 364
 WString
 4
@@ -1581,14 +1590,14 @@
 366
 WVList
 0
-52
+49
 1
 1
 0
 367
 MItem
-5
-pbs.c
+7
+queue.c
 368
 WString
 4
@@ -1599,14 +1608,14 @@
 370
 WVList
 0
-52
+49
 1
 1
 0
 371
 MItem
-12
-player_gui.c
+6
+rail.c
 372
 WString
 4
@@ -1617,14 +1626,14 @@
 374
 WVList
 0
-52
+49
 1
 1
 0
 375
 MItem
-9
-players.c
+10
+rail_cmd.c
 376
 WString
 4
@@ -1635,14 +1644,14 @@
 378
 WVList
 0
-52
+49
 1
 1
 0
 379
 MItem
-6
-pool.c
+10
+rail_gui.c
 380
 WString
 4
@@ -1653,14 +1662,14 @@
 382
 WVList
 0
-52
+49
 1
 1
 0
 383
 MItem
-7
-queue.c
+5
+rev.c
 384
 WString
 4
@@ -1670,96 +1679,96 @@
 0
 386
 WVList
-0
-52
-1
 1
-0
 387
-MItem
-6
-rail.c
+ActionStates
 388
 WString
-4
-COBJ
+5
+&Make
 389
 WVList
 0
-390
-WVList
-0
-52
-1
-1
-0
-391
-MItem
-10
-rail_cmd.c
-392
-WString
-4
-COBJ
-393
-WVList
-0
-394
-WVList
-0
-52
+49
 1
 1
 0
-395
+390
 MItem
 10
-rail_gui.c
-396
+road_cmd.c
+391
 WString
 4
 COBJ
-397
+392
 WVList
 0
-398
+393
 WVList
 0
-52
+49
 1
 1
 0
-399
+394
 MItem
-5
-rev.c
-400
+10
+road_gui.c
+395
 WString
 4
 COBJ
+396
+WVList
+0
+397
+WVList
+0
+49
+1
+1
+0
+398
+MItem
+13
+roadveh_cmd.c
+399
+WString
+4
+COBJ
+400
+WVList
+0
 401
 WVList
 0
+49
+1
+1
+0
 402
-WVList
-1
+MItem
+13
+roadveh_gui.c
 403
-ActionStates
+WString
+4
+COBJ
 404
-WString
-5
-&Make
+WVList
+0
 405
 WVList
 0
-52
+49
 1
 1
 0
 406
 MItem
 10
-road_cmd.c
+saveload.c
 407
 WString
 4
@@ -1770,14 +1779,14 @@
 409
 WVList
 0
-52
+49
 1
 1
 0
 410
 MItem
-10
-road_gui.c
+12
+screenshot.c
 411
 WString
 4
@@ -1788,14 +1797,14 @@
 413
 WVList
 0
-52
+49
 1
 1
 0
 414
 MItem
-13
-roadveh_cmd.c
+5
+sdl.c
 415
 WString
 4
@@ -1806,14 +1815,14 @@
 417
 WVList
 0
-52
+49
 1
 1
 0
 418
 MItem
-13
-roadveh_gui.c
+10
+settings.c
 419
 WString
 4
@@ -1824,14 +1833,14 @@
 421
 WVList
 0
-52
+49
 1
 1
 0
 422
 MItem
-10
-saveload.c
+14
+settings_gui.c
 423
 WString
 4
@@ -1842,14 +1851,14 @@
 425
 WVList
 0
-52
+49
 1
 1
 0
 426
 MItem
-12
-screenshot.c
+10
+ship_cmd.c
 427
 WString
 4
@@ -1860,14 +1869,14 @@
 429
 WVList
 0
-52
+49
 1
 1
 0
 430
 MItem
-5
-sdl.c
+10
+ship_gui.c
 431
 WString
 4
@@ -1878,14 +1887,14 @@
 433
 WVList
 0
-52
+49
 1
 1
 0
 434
 MItem
-10
-settings.c
+7
+signs.c
 435
 WString
 4
@@ -1896,14 +1905,14 @@
 437
 WVList
 0
-52
+49
 1
 1
 0
 438
 MItem
 14
-settings_gui.c
+smallmap_gui.c
 439
 WString
 4
@@ -1914,14 +1923,14 @@
 441
 WVList
 0
-52
+49
 1
 1
 0
 442
 MItem
-10
-ship_cmd.c
+7
+sound.c
 443
 WString
 4
@@ -1932,14 +1941,14 @@
 445
 WVList
 0
-52
+49
 1
 1
 0
 446
 MItem
-10
-ship_gui.c
+14
+sound\null_s.c
 447
 WString
 4
@@ -1950,14 +1959,14 @@
 449
 WVList
 0
-52
+49
 1
 1
 0
 450
 MItem
-7
-signs.c
+13
+sound\sdl_s.c
 451
 WString
 4
@@ -1968,14 +1977,14 @@
 453
 WVList
 0
-52
+49
 1
 1
 0
 454
 MItem
-14
-smallmap_gui.c
+8
+sprite.c
 455
 WString
 4
@@ -1986,14 +1995,14 @@
 457
 WVList
 0
-52
+49
 1
 1
 0
 458
 MItem
-7
-sound.c
+13
+spritecache.c
 459
 WString
 4
@@ -2004,14 +2013,14 @@
 461
 WVList
 0
-52
+49
 1
 1
 0
 462
 MItem
-14
-sound\null_s.c
+13
+station_cmd.c
 463
 WString
 4
@@ -2022,14 +2031,14 @@
 465
 WVList
 0
-52
+49
 1
 1
 0
 466
 MItem
 13
-sound\sdl_s.c
+station_gui.c
 467
 WString
 4
@@ -2040,14 +2049,14 @@
 469
 WVList
 0
-52
+49
 1
 1
 0
 470
 MItem
-8
-sprite.c
+16
+station_newgrf.c
 471
 WString
 4
@@ -2058,14 +2067,14 @@
 473
 WVList
 0
-52
+49
 1
 1
 0
 474
 MItem
-13
-spritecache.c
+8
+StdAfx.c
 475
 WString
 4
@@ -2076,14 +2085,14 @@
 477
 WVList
 0
-52
+49
 1
 1
 0
 478
 MItem
-13
-station_cmd.c
+8
+string.c
 479
 WString
 4
@@ -2094,14 +2103,14 @@
 481
 WVList
 0
-52
+49
 1
 1
 0
 482
 MItem
-13
-station_gui.c
+9
+strings.c
 483
 WString
 4
@@ -2112,14 +2121,14 @@
 485
 WVList
 0
-52
+49
 1
 1
 0
 486
 MItem
-16
-station_newgrf.c
+13
+subsidy_gui.c
 487
 WString
 4
@@ -2130,14 +2139,14 @@
 489
 WVList
 0
-52
+49
 1
 1
 0
 490
 MItem
-8
-StdAfx.c
+15
+terraform_gui.c
 491
 WString
 4
@@ -2148,14 +2157,14 @@
 493
 WVList
 0
-52
+49
 1
 1
 0
 494
 MItem
-8
-string.c
+9
+texteff.c
 495
 WString
 4
@@ -2166,14 +2175,14 @@
 497
 WVList
 0
-52
+49
 1
 1
 0
 498
 MItem
-9
-strings.c
+8
+thread.c
 499
 WString
 4
@@ -2184,14 +2193,14 @@
 501
 WVList
 0
-52
+49
 1
 1
 0
 502
 MItem
-13
-subsidy_gui.c
+6
+tile.c
 503
 WString
 4
@@ -2202,14 +2211,14 @@
 505
 WVList
 0
-52
+49
 1
 1
 0
 506
 MItem
-15
-terraform_gui.c
+10
+town_cmd.c
 507
 WString
 4
@@ -2220,14 +2229,14 @@
 509
 WVList
 0
-52
+49
 1
 1
 0
 510
 MItem
-9
-texteff.c
+10
+town_gui.c
 511
 WString
 4
@@ -2238,14 +2247,14 @@
 513
 WVList
 0
-52
+49
 1
 1
 0
 514
 MItem
-8
-thread.c
+11
+train_cmd.c
 515
 WString
 4
@@ -2256,14 +2265,14 @@
 517
 WVList
 0
-52
+49
 1
 1
 0
 518
 MItem
-6
-tile.c
+11
+train_gui.c
 519
 WString
 4
@@ -2274,14 +2283,14 @@
 521
 WVList
 0
-52
+49
 1
 1
 0
 522
 MItem
 10
-town_cmd.c
+tree_cmd.c
 523
 WString
 4
@@ -2292,14 +2301,14 @@
 525
 WVList
 0
-52
+49
 1
 1
 0
 526
 MItem
-10
-town_gui.c
+18
+tunnelbridge_cmd.c
 527
 WString
 4
@@ -2310,14 +2319,14 @@
 529
 WVList
 0
-52
+49
 1
 1
 0
 530
 MItem
-11
-train_cmd.c
+15
+unmovable_cmd.c
 531
 WString
 4
@@ -2328,14 +2337,14 @@
 533
 WVList
 0
-52
+49
 1
 1
 0
 534
 MItem
-11
-train_gui.c
+9
+vehicle.c
 535
 WString
 4
@@ -2346,14 +2355,14 @@
 537
 WVList
 0
-52
+49
 1
 1
 0
 538
 MItem
-10
-tree_cmd.c
+13
+vehicle_gui.c
 539
 WString
 4
@@ -2364,14 +2373,14 @@
 541
 WVList
 0
-52
+49
 1
 1
 0
 542
 MItem
-18
-tunnelbridge_cmd.c
+19
+video\dedicated_v.c
 543
 WString
 4
@@ -2382,14 +2391,14 @@
 545
 WVList
 0
-52
+49
 1
 1
 0
 546
 MItem
-15
-unmovable_cmd.c
+14
+video\null_v.c
 547
 WString
 4
@@ -2400,14 +2409,14 @@
 549
 WVList
 0
-52
+49
 1
 1
 0
 550
 MItem
-9
-vehicle.c
+13
+video\sdl_v.c
 551
 WString
 4
@@ -2418,14 +2427,14 @@
 553
 WVList
 0
-52
+49
 1
 1
 0
 554
 MItem
-13
-vehicle_gui.c
+10
+viewport.c
 555
 WString
 4
@@ -2436,14 +2445,14 @@
 557
 WVList
 0
-52
+49
 1
 1
 0
 558
 MItem
-19
-video\dedicated_v.c
+11
+water_cmd.c
 559
 WString
 4
@@ -2454,14 +2463,14 @@
 561
 WVList
 0
-52
+49
 1
 1
 0
 562
 MItem
-14
-video\null_v.c
+10
+waypoint.c
 563
 WString
 4
@@ -2472,14 +2481,14 @@
 565
 WVList
 0
-52
+49
 1
 1
 0
 566
 MItem
-13
-video\sdl_v.c
+8
+widget.c
 567
 WString
 4
@@ -2490,14 +2499,14 @@
 569
 WVList
 0
-52
+49
 1
 1
 0
 570
 MItem
-10
-viewport.c
+8
+window.c
 571
 WString
 4
@@ -2508,79 +2517,7 @@
 573
 WVList
 0
-52
-1
-1
-0
-574
-MItem
-11
-water_cmd.c
-575
-WString
-4
-COBJ
-576
-WVList
-0
-577
-WVList
-0
-52
+49
 1
 1
 0
-578
-MItem
-10
-waypoint.c
-579
-WString
-4
-COBJ
-580
-WVList
-0
-581
-WVList
-0
-52
-1
-1
-0
-582
-MItem
-8
-widget.c
-583
-WString
-4
-COBJ
-584
-WVList
-0
-585
-WVList
-0
-52
-1
-1
-0
-586
-MItem
-8
-window.c
-587
-WString
-4
-COBJ
-588
-WVList
-0
-589
-WVList
-0
-52
-1
-1
-0

--- a/os/os2/openttd.wpj	Sun Mar 26 18:49:31 2006 +0000
+++ b/os/os2/openttd.wpj	Fri Mar 31 16:19:16 2006 +0000
@@ -43,8 +43,8 @@
 WFileName
 17
 ..\..\openttd.tgt
-0
-0
+61
+63
 11
 VComponent
 12

--- a/strgen/strgen.c	Sun Mar 26 18:49:31 2006 +0000
+++ b/strgen/strgen.c	Fri Mar 31 16:19:16 2006 +0000
@@ -19,6 +19,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);