equal
deleted
inserted
replaced
12 |
12 |
13 extern byte _name_array[512][32]; |
13 extern byte _name_array[512][32]; |
14 extern TileIndex _animated_tile_list[256]; |
14 extern TileIndex _animated_tile_list[256]; |
15 extern uint16 _custom_sprites_base; |
15 extern uint16 _custom_sprites_base; |
16 |
16 |
17 #if defined(_MSC_VER) |
17 #if defined(_MSC_VER) || defined(__WATCOMC__) |
18 #pragma pack(push, 1) |
18 #pragma pack(push, 1) |
19 #endif |
19 #endif |
20 |
20 |
21 typedef struct { |
21 typedef struct { |
22 uint16 string_id; |
22 uint16 string_id; |
497 byte map_type_and_height[256*256]; |
497 byte map_type_and_height[256*256]; |
498 byte map5[256*256]; |
498 byte map5[256*256]; |
499 } GCC_PACK OldMain; |
499 } GCC_PACK OldMain; |
500 assert_compile(sizeof(OldMain) == 487801 + 256*256*2); |
500 assert_compile(sizeof(OldMain) == 487801 + 256*256*2); |
501 |
501 |
502 #if defined(_MSC_VER) |
502 #if defined(_MSC_VER) || defined(__WATCOMC__) |
503 #pragma pack(pop) |
503 #pragma pack(pop) |
504 #endif |
504 #endif |
505 |
505 |
506 #define REMAP_TOWN_IDX(x) (x - (0x0459154 - 0x0458EF0)) / sizeof(OldTown) |
506 #define REMAP_TOWN_IDX(x) (x - (0x0459154 - 0x0458EF0)) / sizeof(OldTown) |
507 #define REMAP_TOWN_PTR(x) GetTown( REMAP_TOWN_IDX(x) ) |
507 #define REMAP_TOWN_PTR(x) GetTown( REMAP_TOWN_IDX(x) ) |