diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2014-07-24 17:10:21 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-07-24 17:10:21 +0100 |
| commit | cdb33ab174a43fb3cc19dcd672bbfd3191fd84aa (patch) | |
| tree | 7e191c76630db4190c89434fcd13db77478428db /src/server/game/Server/Protocol | |
| parent | 1ab65432a62176e57e19eb08e260382354caffdf (diff) | |
| parent | 3de1714350f1f83ff880ee927523aabfb5731475 (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_feralas.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_generic.cpp
Diffstat (limited to 'src/server/game/Server/Protocol')
| -rw-r--r-- | src/server/game/Server/Protocol/ServerPktHeader.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Server/Protocol/ServerPktHeader.h b/src/server/game/Server/Protocol/ServerPktHeader.h index 4b0dae9f0f3..fcb24cfa80d 100644 --- a/src/server/game/Server/Protocol/ServerPktHeader.h +++ b/src/server/game/Server/Protocol/ServerPktHeader.h @@ -21,6 +21,8 @@ #include "Log.h" +#pragma pack(push, 1) + struct ServerPktHeader { /** @@ -56,4 +58,6 @@ struct ServerPktHeader uint8 header[5]; }; +#pragma pack(pop) + #endif |