diff options
| author | Haru <haru@dotalux.com> | 2020-03-08 16:01:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-08 16:01:44 +0100 |
| commit | 43e2ec7bf29dc0bb7a5b67d420f6f76d0154c01b (patch) | |
| tree | 26b15fa25fc0bc50bbe9d086da2ab2880b7cc55b /src/map/packets_struct.h | |
| parent | c736a04fcd4efdf6f8b5b5ed01f73fc640493064 (diff) | |
| parent | ea7ddfe360c13a43dc3dc1f27d20f865fc5d2b85 (diff) | |
| download | hercules-43e2ec7bf29dc0bb7a5b67d420f6f76d0154c01b.tar.gz hercules-43e2ec7bf29dc0bb7a5b67d420f6f76d0154c01b.tar.bz2 hercules-43e2ec7bf29dc0bb7a5b67d420f6f76d0154c01b.tar.xz hercules-43e2ec7bf29dc0bb7a5b67d420f6f76d0154c01b.zip | |
Merge pull request #2645 from 4144/updatepackets
Update packets up to 2020-03-04
Diffstat (limited to 'src/map/packets_struct.h')
| -rw-r--r-- | src/map/packets_struct.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index b604c77b8..71f986a90 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -3819,9 +3819,15 @@ struct PACKET_ZC_NPC_EXPANDED_BARTER_OPEN_sub { uint32 index; uint32 zeny; uint32 currency_count; - struct PACKET_ZC_NPC_EXPANDED_BARTER_OPEN_sub2 currencies[]; + // Workaround for fix Visual Studio bug (error C2233). Here should be currencies[] + struct PACKET_ZC_NPC_EXPANDED_BARTER_OPEN_sub2 currencies[1]; } __attribute__((packed)); +// Workaround check for Visual Studio bug (error C2233) +STATIC_ASSERT(sizeof(struct PACKET_ZC_NPC_EXPANDED_BARTER_OPEN_sub2[1]) == + sizeof(struct PACKET_ZC_NPC_EXPANDED_BARTER_OPEN_sub2), + "Wrong PACKET_ZC_NPC_EXPANDED_BARTER_OPEN_sub size"); + struct PACKET_ZC_NPC_EXPANDED_BARTER_OPEN { int16 packetType; int16 packetLength; |