petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r1411) -Fix: structure packing in the OS/2 version (eg, with the old loader).

Browse Source
This commit is contained in:
truelight
2005-01-07 09:28:16 +00:00
parent 8ed132a5b9
commit e58739c559
4 changed files with 410 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
oldloader.c
View File

@@ -14,7 +14,7 @@ extern byte _name_array[512][32];
extern TileIndex _animated_tile_list[256]; extern TileIndex _animated_tile_list[256];
extern uint16 _custom_sprites_base; extern uint16 _custom_sprites_base;
#if defined(_MSC_VER) #if defined(_MSC_VER) || defined(__WATCOMC__)
#pragma pack(push, 1) #pragma pack(push, 1)
#endif #endif
@@ -499,7 +499,7 @@ typedef struct {
} GCC_PACK OldMain; } GCC_PACK OldMain;
assert_compile(sizeof(OldMain) == 487801 + 256*256*2); assert_compile(sizeof(OldMain) == 487801 + 256*256*2);
#if defined(_MSC_VER) #if defined(_MSC_VER) || defined(__WATCOMC__)
#pragma pack(pop) #pragma pack(pop)
#endif #endif

786
openttd.tgt
View File

File diff suppressed because it is too large Load Diff

2
os/os2/openttd.wpj
View File

@@ -43,7 +43,7 @@ WFileName
17 17
..\..\openttd.tgt ..\..\openttd.tgt
47 47
49 58
11 11
VComponent VComponent
12 12

4
screenshot.c
View File

@@ -20,7 +20,7 @@ typedef struct {
//************************************************ //************************************************
//*** SCREENSHOT CODE FOR WINDOWS BITMAP (.BMP) //*** SCREENSHOT CODE FOR WINDOWS BITMAP (.BMP)
//************************************************ //************************************************
#if defined(_MSC_VER) #if defined(_MSC_VER) || defined(__WATCOMC__)
#pragma pack(push, 1) #pragma pack(push, 1)
#endif #endif
@@ -32,7 +32,7 @@ typedef struct BitmapFileHeader {
} GCC_PACK BitmapFileHeader; } GCC_PACK BitmapFileHeader;
assert_compile(sizeof(BitmapFileHeader) == 14); assert_compile(sizeof(BitmapFileHeader) == 14);
#if defined(_MSC_VER) #if defined(_MSC_VER) || defined(__WATCOMC__)
#pragma pack(pop) #pragma pack(pop)
#endif #endif