* Fix SMSG_TRANSFER_ABORTED. Don't modify packet structures unless you actually verify them...

--HG--
branch : trunk
This commit is contained in:
XTZGZoReX
2010-02-28 19:08:40 +01:00
parent ac48523b14
commit 2383c5b79e
2 changed files with 3 additions and 4 deletions
+2 -3
View File
@@ -20367,7 +20367,7 @@ void Player::SendUpdateToOutOfRangeGroupMembers()
pet->ResetAuraUpdateMaskForRaid(); pet->ResetAuraUpdateMaskForRaid();
} }
void Player::SendTransferAborted(uint32 mapid, uint8 reason, uint8 arg) void Player::SendTransferAborted(uint32 mapid, TransferAbortReason reason, uint8 arg)
{ {
WorldPacket data(SMSG_TRANSFER_ABORTED, 4+2); WorldPacket data(SMSG_TRANSFER_ABORTED, 4+2);
data << uint32(mapid); data << uint32(mapid);
@@ -20377,8 +20377,7 @@ void Player::SendTransferAborted(uint32 mapid, uint8 reason, uint8 arg)
case TRANSFER_ABORT_INSUF_EXPAN_LVL: case TRANSFER_ABORT_INSUF_EXPAN_LVL:
case TRANSFER_ABORT_DIFFICULTY: case TRANSFER_ABORT_DIFFICULTY:
case TRANSFER_ABORT_UNIQUE_MESSAGE: case TRANSFER_ABORT_UNIQUE_MESSAGE:
case TRANSFER_ABORT_ZONE_IN_COMBAT: // these are the ONLY cases that have an extra argument in the packet!!!
case TRANSFER_ABORT_MAX_PLAYERS:
data << uint8(arg); data << uint8(arg);
break; break;
} }
+1 -1
View File
@@ -1026,7 +1026,7 @@ class Player : public Unit, public GridObject<Player>
void SendInitialPacketsBeforeAddToMap(); void SendInitialPacketsBeforeAddToMap();
void SendInitialPacketsAfterAddToMap(); void SendInitialPacketsAfterAddToMap();
void SendTransferAborted(uint32 mapid, uint8 reason, uint8 arg = 0); void SendTransferAborted(uint32 mapid, TransferAbortReason reason, uint8 arg = 0);
void SendInstanceResetWarning(uint32 mapid, Difficulty difficulty, uint32 time); void SendInstanceResetWarning(uint32 mapid, Difficulty difficulty, uint32 time);
Creature* GetNPCIfCanInteractWith(uint64 guid, uint32 npcflagmask); Creature* GetNPCIfCanInteractWith(uint64 guid, uint32 npcflagmask);