Mercurial > hg > openttd

changeset 923:dffc734e55a1 draft

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