diff options
author | Spp <spp@jorge.gr> | 2013-01-30 11:57:02 +0100 |
---|---|---|
committer | Spp <spp@jorge.gr> | 2013-01-30 11:57:02 +0100 |
commit | 709129f222768b607b13c0f785aa0313f0a934ce (patch) | |
tree | 7ce9264823841eccf54cc508d6568ce99ec1d7f1 /src/server/game/Handlers/TicketHandler.cpp | |
parent | b427068c39188474879c848ba44070ef8a1e246b (diff) | |
parent | 8cd408ae6cb2a7f9eb84c9e2a57fc65a15ce6faf (diff) |
Merge branch 'master' into 4.3.4 (+ some changes to minimize differences)
Conflicts:
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Events/GameEventMgr.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Miscellaneous/Formulas.h
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Movement/Waypoints/WaypointManager.cpp
src/server/game/Skills/SkillDiscovery.cpp
src/server/game/Skills/SkillExtraItems.cpp
src/server/game/Warden/WardenCheckMgr.cpp
src/server/game/Weather/WeatherMgr.cpp
Diffstat (limited to 'src/server/game/Handlers/TicketHandler.cpp')
-rw-r--r-- | src/server/game/Handlers/TicketHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Handlers/TicketHandler.cpp b/src/server/game/Handlers/TicketHandler.cpp index 4463613a97b..2da2735a3f9 100644 --- a/src/server/game/Handlers/TicketHandler.cpp +++ b/src/server/game/Handlers/TicketHandler.cpp @@ -69,7 +69,7 @@ void WorldSession::HandleGMTicketCreateOpcode(WorldPacket& recvData) dest.resize(decompressedSize); uLongf realSize = decompressedSize; - if (uncompress(const_cast<uint8*>(dest.contents()), &realSize, const_cast<uint8*>(recvData.contents() + pos), recvData.size() - pos) == Z_OK) + if (uncompress(dest.contents(), &realSize, recvData.contents() + pos, recvData.size() - pos) == Z_OK) { dest >> chatLog; ticket->SetChatLog(times, chatLog); |