(svn r1411) -Fix: structure packing in the OS/2 version (eg, with the old loader).
authortruelight
Fri, 07 Jan 2005 09:28:16 +0000
changeset 923 865f9716f7f5
parent 922 fc040662bd43
child 924 433faaf547c1
(svn r1411) -Fix: structure packing in the OS/2 version (eg, with the old loader).
oldloader.c
openttd.tgt
os/os2/openttd.wpj
screenshot.c
--- a/oldloader.c	Fri Jan 07 08:38:27 2005 +0000
+++ b/oldloader.c	Fri Jan 07 09:28:16 2005 +0000
@@ -14,7 +14,7 @@
 extern TileIndex _animated_tile_list[256];
 extern uint16 _custom_sprites_base;
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__WATCOMC__)
 #pragma pack(push, 1)
 #endif
 
@@ -499,7 +499,7 @@
 } GCC_PACK OldMain;
 assert_compile(sizeof(OldMain) == 487801 + 256*256*2);
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__WATCOMC__)
 #pragma pack(pop)
 #endif
 
--- a/openttd.tgt	Fri Jan 07 08:38:27 2005 +0000
+++ b/openttd.tgt	Fri Jan 07 09:28:16 2005 +0000
@@ -205,7 +205,7 @@
 COBJ
 54
 WVList
-13
+15
 55
 MVState
 56
@@ -362,10 +362,10 @@
 WCC
 94
 WString
-29
-?????No debugging information
+20
+?????Pack structures
 0
-1
+0
 95
 MRState
 96
@@ -374,1706 +374,1730 @@
 WCC
 97
 WString
+27
+?????Default byte alignment
+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
-98
+104
 WVList
 0
 -1
 1
 1
 0
-99
+105
 MItem
 4
 ai.c
-100
-WString
-4
-COBJ
-101
-WVList
-0
-102
-WVList
-0
-52
-1
-1
-0
-103
-MItem
-10
-ai_build.c
-104
-WString
-4
-COBJ
-105
-WVList
-0
 106
-WVList
-0
-52
-1
-1
-0
-107
-MItem
-8
-ai_new.c
-108
-WString
-4
-COBJ
-109
-WVList
-0
-110
-WVList
-0
-52
-1
-1
-0
-111
-MItem
-15
-ai_pathfinder.c
-112
-WString
-4
-COBJ
-113
-WVList
-0
-114
-WVList
-0
-52
-1
-1
-0
-115
-MItem
-11
-ai_shared.c
-116
-WString
-4
-COBJ
-117
-WVList
-0
-118
-WVList
-0
-52
-1
-1
-0
-119
-MItem
-14
-aircraft_cmd.c
-120
-WString
-4
-COBJ
-121
-WVList
-0
-122
-WVList
-0
-52
-1
-1
-0
-123
-MItem
-14
-aircraft_gui.c
-124
-WString
-4
-COBJ
-125
-WVList
-0
-126
-WVList
-0
-52
-1
-1
-0
-127
-MItem
-9
-airport.c
-128
-WString
-4
-COBJ
-129
-WVList
-0
-130
-WVList
-0
-52
-1
-1
-0
-131
-MItem
-13
-airport_gui.c
-132
-WString
-4
-COBJ
-133
-WVList
-0
-134
-WVList
-0
-52
-1
-1
-0
-135
-MItem
-8
-aystar.c
-136
-WString
-4
-COBJ
-137
-WVList
-0
-138
-WVList
-0
-52
-1
-1
-0
-139
-MItem
-12
-bridge_gui.c
-140
-WString
-4
-COBJ
-141
-WVList
-0
-142
-WVList
-0
-52
-1
-1
-0
-143
-MItem
-16
-callback_table.c
-144
-WString
-4
-COBJ
-145
-WVList
-0
-146
-WVList
-0
-52
-1
-1
-0
-147
-MItem
-11
-clear_cmd.c
-148
-WString
-4
-COBJ
-149
-WVList
-0
-150
-WVList
-0
-52
-1
-1
-0
-151
-MItem
-9
-command.c
-152
-WString
-4
-COBJ
-153
-WVList
-0
-154
-WVList
-0
-52
-1
-1
-0
-155
-MItem
-9
-console.c
-156
-WString
-4
-COBJ
-157
-WVList
-0
-158
-WVList
-0
-52
-1
-1
-0
-159
-MItem
-14
-console_cmds.c
-160
-WString
-4
-COBJ
-161
-WVList
-0
-162
-WVList
-0
-52
-1
-1
-0
-163
-MItem
-11
-dedicated.c
-164
-WString
-4
-COBJ
-165
-WVList
-0
-166
-WVList
-0
-52
-1
-1
-0
-167
-MItem
-14
-disaster_cmd.c
-168
-WString
-4
-COBJ
-169
-WVList
-0
-170
-WVList
-0
-52
-1
-1
-0
-171
-MItem
-10
-dock_gui.c
-172
-WString
-4
-COBJ
-173
-WVList
-0
-174
-WVList
-0
-52
-1
-1
-0
-175
-MItem
-12
-dummy_land.c
-176
-WString
-4
-COBJ
-177
-WVList
-0
-178
-WVList
-0
-52
-1
-1
-0
-179
-MItem
-9
-economy.c
-180
-WString
-4
-COBJ
-181
-WVList
-0
-182
-WVList
-0
-52
-1
-1
-0
-183
-MItem
-8
-engine.c
-184
-WString
-4
-COBJ
-185
-WVList
-0
-186
-WVList
-0
-52
-1
-1
-0
-187
-MItem
-12
-engine_gui.c
-188
 WString
 4
 COBJ
-189
-WVList
-0
-190
-WVList
-0
-52
-1
-1
-0
-191
-MItem
-8
-fileio.c
-192
-WString
-4
-COBJ
-193
-WVList
-0
-194
-WVList
-0
-52
-1
-1
-0
-195
-MItem
-5
-gfx.c
-196
-WString
-4
-COBJ
-197
-WVList
-0
-198
-WVList
-0
-52
-1
-1
-0
-199
-MItem
-11
-graph_gui.c
-200
-WString
-4
-COBJ
-201
-WVList
-0
-202
-WVList
-0
-52
-1
-1
-0
-203
-MItem
-14
-industry_cmd.c
-204
-WString
-4
-COBJ
-205
-WVList
-0
-206
-WVList
-0
-52
-1
-1
-0
-207
-MItem
-14
-industry_gui.c
-208
-WString
-4
-COBJ
-209
-WVList
-0
-210
-WVList
-0
-52
-1
-1
-0
-211
-MItem
-11
-intro_gui.c
-212
-WString
-4
-COBJ
-213
-WVList
-0
-214
-WVList
-0
-52
-1
-1
-0
-215
-MItem
-11
-landscape.c
-216
-WString
-4
-COBJ
-217
-WVList
-0
-218
-WVList
-0
-52
-1
-1
-0
-219
-MItem
-10
-main_gui.c
-220
-WString
-4
-COBJ
-221
-WVList
-0
-222
-WVList
-0
-52
-1
-1
-0
-223
-MItem
-5
-map.c
-224
-WString
-4
-COBJ
-225
-WVList
-0
-226
-WVList
-0
-52
-1
-1
-0
-227
-MItem
-5
-md5.c
-228
-WString
-4
-COBJ
-229
-WVList
-0
-230
-WVList
-0
-52
-1
-1
-0
-231
-MItem
-9
-minilzo.c
-232
-WString
-4
-COBJ
-233
-WVList
-0
-234
+107
 WVList
 0
-52
-1
-1
-0
-235
-MItem
-6
-misc.c
-236
-WString
-4
-COBJ
-237
-WVList
-0
-238
-WVList
-0
-52
-1
-1
-0
-239
-MItem
-10
-misc_cmd.c
-240
-WString
-4
-COBJ
-241
-WVList
-0
-242
-WVList
-0
-52
-1
-1
-0
-243
-MItem
-10
-misc_gui.c
-244
-WString
-4
-COBJ
-245
-WVList
-0
-246
-WVList
-0
-52
-1
-1
-0
-247
-MItem
-11
-music_gui.c
-248
-WString
-4
-COBJ
-249
-WVList
-0
-250
-WVList
-0
-52
-1
-1
-0
-251
-MItem
-9
-namegen.c
-252
-WString
-4
-COBJ
-253
-WVList
-0
-254
-WVList
-0
-52
-1
-1
-0
-255
-MItem
-9
-network.c
-256
-WString
-4
-COBJ
-257
-WVList
-0
-258
-WVList
-0
-52
-1
-1
-0
-259
-MItem
-16
-network_client.c
-260
-WString
-4
-COBJ
-261
-WVList
-0
-262
-WVList
-0
-52
-1
-1
-0
-263
-MItem
-14
-network_data.c
-264
-WString
-4
-COBJ
-265
-WVList
-0
-266
-WVList
-0
-52
-1
-1
-0
-267
-MItem
-18
-network_gamelist.c
-268
-WString
-4
-COBJ
-269
-WVList
-0
-270
-WVList
-0
-52
-1
-1
-0
-271
-MItem
-13
-network_gui.c
-272
-WString
-4
-COBJ
-273
-WVList
-0
-274
-WVList
-0
-52
-1
-1
-0
-275
-MItem
-16
-network_server.c
-276
-WString
-4
-COBJ
-277
-WVList
-0
-278
-WVList
-0
-52
-1
-1
-0
-279
-MItem
-13
-network_udp.c
-280
-WString
-4
-COBJ
-281
-WVList
-0
-282
+108
 WVList
 0
 52
 1
 1
 0
-283
-MItem
-8
-newgrf.c
-284
-WString
-4
-COBJ
-285
-WVList
-0
-286
-WVList
-0
-52
-1
-1
-0
-287
+109
 MItem
 10
-news_gui.c
-288
-WString
-4
-COBJ
-289
-WVList
-0
-290
-WVList
-0
-52
-1
-1
-0
-291
-MItem
-11
-oldloader.c
-292
-WString
-4
-COBJ
-293
-WVList
-0
-294
-WVList
-0
-52
-1
-1
-0
-295
-MItem
-11
-order_cmd.c
-296
-WString
-4
-COBJ
-297
-WVList
-0
-298
-WVList
-0
-52
-1
-1
-0
-299
-MItem
-11
-order_gui.c
-300
-WString
-4
-COBJ
-301
-WVList
-0
-302
-WVList
-0
-52
-1
-1
-0
-303
-MItem
-5
-os2.c
-304
-WString
-4
-COBJ
-305
-WVList
-0
-306
-WVList
-0
-52
-1
-1
-0
-307
-MItem
-10
-pathfind.c
-308
-WString
-4
-COBJ
-309
-WVList
-0
-310
-WVList
-0
-52
-1
-1
-0
-311
-MItem
-12
-player_gui.c
-312
-WString
-4
-COBJ
-313
-WVList
-0
-314
-WVList
-0
-52
-1
-1
-0
-315
-MItem
-9
-players.c
-316
-WString
-4
-COBJ
-317
-WVList
-0
-318
-WVList
-0
-52
-1
-1
-0
-319
-MItem
-7
-queue.c
-320
-WString
-4
-COBJ
-321
-WVList
-0
-322
-WVList
-0
-52
-1
-1
-0
-323
-MItem
-10
-rail_cmd.c
-324
-WString
-4
-COBJ
-325
-WVList
-0
-326
-WVList
-0
-52
-1
-1
-0
-327
-MItem
-10
-rail_gui.c
-328
+ai_build.c
+110
 WString
 4
 COBJ
-329
-WVList
-0
-330
-WVList
-0
-52
-1
-1
-0
-331
-MItem
-10
-road_cmd.c
-332
-WString
-4
-COBJ
-333
-WVList
-0
-334
-WVList
-0
-52
-1
-1
-0
-335
-MItem
-10
-road_gui.c
-336
-WString
-4
-COBJ
-337
-WVList
-0
-338
-WVList
-0
-52
-1
-1
-0
-339
-MItem
-13
-roadveh_cmd.c
-340
-WString
-4
-COBJ
-341
-WVList
-0
-342
-WVList
-0
-52
-1
-1
-0
-343
-MItem
-13
-roadveh_gui.c
-344
-WString
-4
-COBJ
-345
-WVList
-0
-346
-WVList
-0
-52
-1
-1
-0
-347
-MItem
-10
-saveload.c
-348
-WString
-4
-COBJ
-349
-WVList
-0
-350
+111
 WVList
 0
-52
-1
-1
-0
-351
-MItem
-12
-screenshot.c
-352
-WString
-4
-COBJ
-353
-WVList
-0
-354
-WVList
-0
-52
-1
-1
-0
-355
-MItem
-5
-sdl.c
-356
-WString
-4
-COBJ
-357
-WVList
-0
-358
-WVList
-0
-52
-1
-1
-0
-359
-MItem
-10
-settings.c
-360
-WString
-4
-COBJ
-361
-WVList
-0
-362
-WVList
-0
-52
-1
-1
-0
-363
-MItem
-14
-settings_gui.c
-364
-WString
-4
-COBJ
-365
-WVList
-0
-366
-WVList
-0
-52
-1
-1
-0
-367
-MItem
-10
-ship_cmd.c
-368
-WString
-4
-COBJ
-369
-WVList
-0
-370
-WVList
-0
-52
-1
-1
-0
-371
-MItem
-10
-ship_gui.c
-372
-WString
-4
-COBJ
-373
-WVList
-0
-374
-WVList
-0
-52
-1
-1
-0
-375
-MItem
-14
-smallmap_gui.c
-376
-WString
-4
-COBJ
-377
-WVList
-0
-378
+112
 WVList
 0
 52
 1
 1
 0
-379
-MItem
-7
-sound.c
-380
-WString
-4
-COBJ
-381
-WVList
-0
-382
-WVList
-0
-52
-1
-1
-0
-383
+113
 MItem
 8
-sprite.c
-384
-WString
-4
-COBJ
-385
-WVList
-0
-386
-WVList
-0
-52
-1
-1
-0
-387
-MItem
-13
-spritecache.c
-388
-WString
-4
-COBJ
-389
-WVList
-0
-390
-WVList
-0
-52
-1
-1
-0
-391
-MItem
-13
-station_cmd.c
-392
-WString
-4
-COBJ
-393
-WVList
-0
-394
-WVList
-0
-52
-1
-1
-0
-395
-MItem
-13
-station_gui.c
-396
-WString
-4
-COBJ
-397
-WVList
-0
-398
-WVList
-0
-52
-1
-1
-0
-399
-MItem
-8
-StdAfx.c
-400
+ai_new.c
+114
 WString
 4
 COBJ
-401
-WVList
-0
-402
-WVList
-0
-52
-1
-1
-0
-403
-MItem
-9
-strings.c
-404
-WString
-4
-COBJ
-405
-WVList
-0
-406
-WVList
-0
-52
-1
-1
-0
-407
-MItem
-13
-subsidy_gui.c
-408
-WString
-4
-COBJ
-409
-WVList
-0
-410
+115
 WVList
 0
-52
-1
-1
-0
-411
-MItem
-15
-terraform_gui.c
-412
-WString
-4
-COBJ
-413
-WVList
-0
-414
-WVList
-0
-52
-1
-1
-0
-415
-MItem
-9
-texteff.c
-416
-WString
-4
-COBJ
-417
-WVList
-0
-418
-WVList
-0
-52
-1
-1
-0
-419
-MItem
-10
-town_cmd.c
-420
-WString
-4
-COBJ
-421
-WVList
-0
-422
-WVList
-0
-52
-1
-1
-0
-423
-MItem
-10
-town_gui.c
-424
-WString
-4
-COBJ
-425
-WVList
-0
-426
+116
 WVList
 0
 52
 1
 1
 0
-427
-MItem
-11
-train_cmd.c
-428
-WString
-4
-COBJ
-429
-WVList
-0
-430
-WVList
-0
-52
-1
-1
-0
-431
+117
 MItem
-11
-train_gui.c
-432
-WString
-4
-COBJ
-433
-WVList
-0
-434
-WVList
-0
-52
-1
-1
-0
-435
-MItem
-10
-tree_cmd.c
-436
+15
+ai_pathfinder.c
+118
 WString
 4
 COBJ
-437
-WVList
-0
-438
-WVList
-0
-52
-1
-1
-0
-439
-MItem
-5
-ttd.c
-440
-WString
-4
-COBJ
-441
-WVList
-0
-442
+119
 WVList
 0
-52
-1
-1
-0
-443
-MItem
-18
-tunnelbridge_cmd.c
-444
-WString
-4
-COBJ
-445
-WVList
-0
-446
-WVList
-0
-52
-1
-1
-0
-447
-MItem
-15
-unmovable_cmd.c
-448
-WString
-4
-COBJ
-449
-WVList
-0
-450
+120
 WVList
 0
 52
 1
 1
 0
-451
+121
 MItem
-9
-vehicle.c
-452
+11
+ai_shared.c
+122
 WString
 4
 COBJ
-453
-WVList
-0
-454
+123
 WVList
 0
-52
-1
-1
-0
-455
-MItem
-13
-vehicle_gui.c
-456
-WString
-4
-COBJ
-457
-WVList
-0
-458
-WVList
-0
-52
-1
-1
-0
-459
-MItem
-10
-viewport.c
-460
-WString
-4
-COBJ
-461
-WVList
-0
-462
+124
 WVList
 0
 52
 1
 1
 0
-463
+125
 MItem
-11
-water_cmd.c
-464
+14
+aircraft_cmd.c
+126
 WString
 4
 COBJ
-465
+127
 WVList
 0
-466
+128
 WVList
 0
 52
 1
 1
 0
-467
+129
 MItem
-8
-widget.c
-468
+14
+aircraft_gui.c
+130
 WString
 4
 COBJ
-469
+131
 WVList
 0
-470
+132
 WVList
 0
 52
 1
 1
 0
-471
+133
 MItem
-8
-window.c
-472
+9
+airport.c
+134
 WString
 4
 COBJ
-473
+135
 WVList
 0
-474
+136
 WVList
 0
 52
 1
 1
 0
+137
+MItem
+13
+airport_gui.c
+138
+WString
+4
+COBJ
+139
+WVList
+0
+140
+WVList
+0
+52
+1
+1
+0
+141
+MItem
+8
+aystar.c
+142
+WString
+4
+COBJ
+143
+WVList
+0
+144
+WVList
+0
+52
+1
+1
+0
+145
+MItem
+12
+bridge_gui.c
+146
+WString
+4
+COBJ
+147
+WVList
+0
+148
+WVList
+0
+52
+1
+1
+0
+149
+MItem
+16
+callback_table.c
+150
+WString
+4
+COBJ
+151
+WVList
+0
+152
+WVList
+0
+52
+1
+1
+0
+153
+MItem
+11
+clear_cmd.c
+154
+WString
+4
+COBJ
+155
+WVList
+0
+156
+WVList
+0
+52
+1
+1
+0
+157
+MItem
+9
+command.c
+158
+WString
+4
+COBJ
+159
+WVList
+0
+160
+WVList
+0
+52
+1
+1
+0
+161
+MItem
+9
+console.c
+162
+WString
+4
+COBJ
+163
+WVList
+0
+164
+WVList
+0
+52
+1
+1
+0
+165
+MItem
+14
+console_cmds.c
+166
+WString
+4
+COBJ
+167
+WVList
+0
+168
+WVList
+0
+52
+1
+1
+0
+169
+MItem
+11
+dedicated.c
+170
+WString
+4
+COBJ
+171
+WVList
+0
+172
+WVList
+0
+52
+1
+1
+0
+173
+MItem
+14
+disaster_cmd.c
+174
+WString
+4
+COBJ
+175
+WVList
+0
+176
+WVList
+0
+52
+1
+1
+0
+177
+MItem
+10
+dock_gui.c
+178
+WString
+4
+COBJ
+179
+WVList
+0
+180
+WVList
+0
+52
+1
+1
+0
+181
+MItem
+12
+dummy_land.c
+182
+WString
+4
+COBJ
+183
+WVList
+0
+184
+WVList
+0
+52
+1
+1
+0
+185
+MItem
+9
+economy.c
+186
+WString
+4
+COBJ
+187
+WVList
+0
+188
+WVList
+0
+52
+1
+1
+0
+189
+MItem
+8
+engine.c
+190
+WString
+4
+COBJ
+191
+WVList
+0
+192
+WVList
+0
+52
+1
+1
+0
+193
+MItem
+12
+engine_gui.c
+194
+WString
+4
+COBJ
+195
+WVList
+0
+196
+WVList
+0
+52
+1
+1
+0
+197
+MItem
+8
+fileio.c
+198
+WString
+4
+COBJ
+199
+WVList
+0
+200
+WVList
+0
+52
+1
+1
+0
+201
+MItem
+5
+gfx.c
+202
+WString
+4
+COBJ
+203
+WVList
+0
+204
+WVList
+0
+52
+1
+1
+0
+205
+MItem
+11
+graph_gui.c
+206
+WString
+4
+COBJ
+207
+WVList
+0
+208
+WVList
+0
+52
+1
+1
+0
+209
+MItem
+14
+industry_cmd.c
+210
+WString
+4
+COBJ
+211
+WVList
+0
+212
+WVList
+0
+52
+1
+1
+0
+213
+MItem
+14
+industry_gui.c
+214
+WString
+4
+COBJ
+215
+WVList
+0
+216
+WVList
+0
+52
+1
+1
+0
+217
+MItem
+11
+intro_gui.c
+218
+WString
+4
+COBJ
+219
+WVList
+0
+220
+WVList
+0
+52
+1
+1
+0
+221
+MItem
+11
+landscape.c
+222
+WString
+4
+COBJ
+223
+WVList
+0
+224
+WVList
+0
+52
+1
+1
+0
+225
+MItem
+10
+main_gui.c
+226
+WString
+4
+COBJ
+227
+WVList
+0
+228
+WVList
+0
+52
+1
+1
+0
+229
+MItem
+5
+map.c
+230
+WString
+4
+COBJ
+231
+WVList
+0
+232
+WVList
+0
+52
+1
+1
+0
+233
+MItem
+5
+md5.c
+234
+WString
+4
+COBJ
+235
+WVList
+0
+236
+WVList
+0
+52
+1
+1
+0
+237
+MItem
+9
+minilzo.c
+238
+WString
+4
+COBJ
+239
+WVList
+0
+240
+WVList
+0
+52
+1
+1
+0
+241
+MItem
+6
+misc.c
+242
+WString
+4
+COBJ
+243
+WVList
+0
+244
+WVList
+0
+52
+1
+1
+0
+245
+MItem
+10
+misc_cmd.c
+246
+WString
+4
+COBJ
+247
+WVList
+0
+248
+WVList
+0
+52
+1
+1
+0
+249
+MItem
+10
+misc_gui.c
+250
+WString
+4
+COBJ
+251
+WVList
+0
+252
+WVList
+0
+52
+1
+1
+0
+253
+MItem
+11
+music_gui.c
+254
+WString
+4
+COBJ
+255
+WVList
+0
+256
+WVList
+0
+52
+1
+1
+0
+257
+MItem
+9
+namegen.c
+258
+WString
+4
+COBJ
+259
+WVList
+0
+260
+WVList
+0
+52
+1
+1
+0
+261
+MItem
+9
+network.c
+262
+WString
+4
+COBJ
+263
+WVList
+0
+264
+WVList
+0
+52
+1
+1
+0
+265
+MItem
+16
+network_client.c
+266
+WString
+4
+COBJ
+267
+WVList
+0
+268
+WVList
+0
+52
+1
+1
+0
+269
+MItem
+14
+network_data.c
+270
+WString
+4
+COBJ
+271
+WVList
+0
+272
+WVList
+0
+52
+1
+1
+0
+273
+MItem
+18
+network_gamelist.c
+274
+WString
+4
+COBJ
+275
+WVList
+0
+276
+WVList
+0
+52
+1
+1
+0
+277
+MItem
+13
+network_gui.c
+278
+WString
+4
+COBJ
+279
+WVList
+0
+280
+WVList
+0
+52
+1
+1
+0
+281
+MItem
+16
+network_server.c
+282
+WString
+4
+COBJ
+283
+WVList
+0
+284
+WVList
+0
+52
+1
+1
+0
+285
+MItem
+13
+network_udp.c
+286
+WString
+4
+COBJ
+287
+WVList
+0
+288
+WVList
+0
+52
+1
+1
+0
+289
+MItem
+8
+newgrf.c
+290
+WString
+4
+COBJ
+291
+WVList
+0
+292
+WVList
+0
+52
+1
+1
+0
+293
+MItem
+10
+news_gui.c
+294
+WString
+4
+COBJ
+295
+WVList
+0
+296
+WVList
+0
+52
+1
+1
+0
+297
+MItem
+11
+oldloader.c
+298
+WString
+4
+COBJ
+299
+WVList
+0
+300
+WVList
+0
+52
+1
+1
+0
+301
+MItem
+11
+order_cmd.c
+302
+WString
+4
+COBJ
+303
+WVList
+0
+304
+WVList
+0
+52
+1
+1
+0
+305
+MItem
+11
+order_gui.c
+306
+WString
+4
+COBJ
+307
+WVList
+0
+308
+WVList
+0
+52
+1
+1
+0
+309
+MItem
+5
+os2.c
+310
+WString
+4
+COBJ
+311
+WVList
+0
+312
+WVList
+0
+52
+1
+1
+0
+313
+MItem
+10
+pathfind.c
+314
+WString
+4
+COBJ
+315
+WVList
+0
+316
+WVList
+0
+52
+1
+1
+0
+317
+MItem
+12
+player_gui.c
+318
+WString
+4
+COBJ
+319
+WVList
+0
+320
+WVList
+0
+52
+1
+1
+0
+321
+MItem
+9
+players.c
+322
+WString
+4
+COBJ
+323
+WVList
+0
+324
+WVList
+0
+52
+1
+1
+0
+325
+MItem
+7
+queue.c
+326
+WString
+4
+COBJ
+327
+WVList
+0
+328
+WVList
+0
+52
+1
+1
+0
+329
+MItem
+10
+rail_cmd.c
+330
+WString
+4
+COBJ
+331
+WVList
+0
+332
+WVList
+0
+52
+1
+1
+0
+333
+MItem
+10
+rail_gui.c
+334
+WString
+4
+COBJ
+335
+WVList
+0
+336
+WVList
+0
+52
+1
+1
+0
+337
+MItem
+10
+road_cmd.c
+338
+WString
+4
+COBJ
+339
+WVList
+0
+340
+WVList
+0
+52
+1
+1
+0
+341
+MItem
+10
+road_gui.c
+342
+WString
+4
+COBJ
+343
+WVList
+0
+344
+WVList
+0
+52
+1
+1
+0
+345
+MItem
+13
+roadveh_cmd.c
+346
+WString
+4
+COBJ
+347
+WVList
+0
+348
+WVList
+0
+52
+1
+1
+0
+349
+MItem
+13
+roadveh_gui.c
+350
+WString
+4
+COBJ
+351
+WVList
+0
+352
+WVList
+0
+52
+1
+1
+0
+353
+MItem
+10
+saveload.c
+354
+WString
+4
+COBJ
+355
+WVList
+0
+356
+WVList
+0
+52
+1
+1
+0
+357
+MItem
+12
+screenshot.c
+358
+WString
+4
+COBJ
+359
+WVList
+0
+360
+WVList
+0
+52
+1
+1
+0
+361
+MItem
+5
+sdl.c
+362
+WString
+4
+COBJ
+363
+WVList
+0
+364
+WVList
+0
+52
+1
+1
+0
+365
+MItem
+10
+settings.c
+366
+WString
+4
+COBJ
+367
+WVList
+0
+368
+WVList
+0
+52
+1
+1
+0
+369
+MItem
+14
+settings_gui.c
+370
+WString
+4
+COBJ
+371
+WVList
+0
+372
+WVList
+0
+52
+1
+1
+0
+373
+MItem
+10
+ship_cmd.c
+374
+WString
+4
+COBJ
+375
+WVList
+0
+376
+WVList
+0
+52
+1
+1
+0
+377
+MItem
+10
+ship_gui.c
+378
+WString
+4
+COBJ
+379
+WVList
+0
+380
+WVList
+0
+52
+1
+1
+0
+381
+MItem
+14
+smallmap_gui.c
+382
+WString
+4
+COBJ
+383
+WVList
+0
+384
+WVList
+0
+52
+1
+1
+0
+385
+MItem
+7
+sound.c
+386
+WString
+4
+COBJ
+387
+WVList
+0
+388
+WVList
+0
+52
+1
+1
+0
+389
+MItem
+8
+sprite.c
+390
+WString
+4
+COBJ
+391
+WVList
+0
+392
+WVList
+0
+52
+1
+1
+0
+393
+MItem
+13
+spritecache.c
+394
+WString
+4
+COBJ
+395
+WVList
+0
+396
+WVList
+0
+52
+1
+1
+0
+397
+MItem
+13
+station_cmd.c
+398
+WString
+4
+COBJ
+399
+WVList
+0
+400
+WVList
+0
+52
+1
+1
+0
+401
+MItem
+13
+station_gui.c
+402
+WString
+4
+COBJ
+403
+WVList
+0
+404
+WVList
+0
+52
+1
+1
+0
+405
+MItem
+8
+StdAfx.c
+406
+WString
+4
+COBJ
+407
+WVList
+0
+408
+WVList
+0
+52
+1
+1
+0
+409
+MItem
+9
+strings.c
+410
+WString
+4
+COBJ
+411
+WVList
+0
+412
+WVList
+0
+52
+1
+1
+0
+413
+MItem
+13
+subsidy_gui.c
+414
+WString
+4
+COBJ
+415
+WVList
+0
+416
+WVList
+0
+52
+1
+1
+0
+417
+MItem
+15
+terraform_gui.c
+418
+WString
+4
+COBJ
+419
+WVList
+0
+420
+WVList
+0
+52
+1
+1
+0
+421
+MItem
+9
+texteff.c
+422
+WString
+4
+COBJ
+423
+WVList
+0
+424
+WVList
+0
+52
+1
+1
+0
+425
+MItem
+10
+town_cmd.c
+426
+WString
+4
+COBJ
+427
+WVList
+0
+428
+WVList
+0
+52
+1
+1
+0
+429
+MItem
+10
+town_gui.c
+430
+WString
+4
+COBJ
+431
+WVList
+0
+432
+WVList
+0
+52
+1
+1
+0
+433
+MItem
+11
+train_cmd.c
+434
+WString
+4
+COBJ
+435
+WVList
+0
+436
+WVList
+0
+52
+1
+1
+0
+437
+MItem
+11
+train_gui.c
+438
+WString
+4
+COBJ
+439
+WVList
+0
+440
+WVList
+0
+52
+1
+1
+0
+441
+MItem
+10
+tree_cmd.c
+442
+WString
+4
+COBJ
+443
+WVList
+0
+444
+WVList
+0
+52
+1
+1
+0
+445
+MItem
+5
+ttd.c
+446
+WString
+4
+COBJ
+447
+WVList
+0
+448
+WVList
+0
+52
+1
+1
+0
+449
+MItem
+18
+tunnelbridge_cmd.c
+450
+WString
+4
+COBJ
+451
+WVList
+0
+452
+WVList
+0
+52
+1
+1
+0
+453
+MItem
+15
+unmovable_cmd.c
+454
+WString
+4
+COBJ
+455
+WVList
+0
+456
+WVList
+0
+52
+1
+1
+0
+457
+MItem
+9
+vehicle.c
+458
+WString
+4
+COBJ
+459
+WVList
+0
+460
+WVList
+0
+52
+1
+1
+0
+461
+MItem
+13
+vehicle_gui.c
+462
+WString
+4
+COBJ
+463
+WVList
+0
+464
+WVList
+0
+52
+1
+1
+0
+465
+MItem
+10
+viewport.c
+466
+WString
+4
+COBJ
+467
+WVList
+0
+468
+WVList
+0
+52
+1
+1
+0
+469
+MItem
+11
+water_cmd.c
+470
+WString
+4
+COBJ
+471
+WVList
+0
+472
+WVList
+0
+52
+1
+1
+0
+473
+MItem
+8
+widget.c
+474
+WString
+4
+COBJ
+475
+WVList
+0
+476
+WVList
+0
+52
+1
+1
+0
+477
+MItem
+8
+window.c
+478
+WString
+4
+COBJ
+479
+WVList
+0
+480
+WVList
+0
+52
+1
+1
+0
--- a/os/os2/openttd.wpj	Fri Jan 07 08:38:27 2005 +0000
+++ b/os/os2/openttd.wpj	Fri Jan 07 09:28:16 2005 +0000
@@ -43,7 +43,7 @@
 17
 ..\..\openttd.tgt
 47
-49
+58
 11
 VComponent
 12
--- a/screenshot.c	Fri Jan 07 08:38:27 2005 +0000
+++ b/screenshot.c	Fri Jan 07 09:28:16 2005 +0000
@@ -20,7 +20,7 @@
 //************************************************
 //*** SCREENSHOT CODE FOR WINDOWS BITMAP (.BMP)
 //************************************************
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__WATCOMC__)
 #pragma pack(push, 1)
 #endif
 
@@ -32,7 +32,7 @@
 } GCC_PACK BitmapFileHeader;
 assert_compile(sizeof(BitmapFileHeader) == 14);
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__WATCOMC__)
 #pragma pack(pop)
 #endif