diff options
| author | tartalo <none@none> | 2009-10-21 23:46:07 +0200 |
|---|---|---|
| committer | tartalo <none@none> | 2009-10-21 23:46:07 +0200 |
| commit | 2d713bbc70f964b86ead727d0fb523bc8fc899d4 (patch) | |
| tree | c477da9f56538c91c8116a5760c557a8cf4cb4b3 /src/game/Player.cpp | |
| parent | 5e9c0d385ac862d11b0a1a6d894dce4ac172d39b (diff) | |
Fix compile && better solution for previos patch, by Spp
--HG--
branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
| -rw-r--r-- | src/game/Player.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 18ffff3a0b2..ccbaf8f5b53 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -19466,6 +19466,8 @@ void Player::SendTransferAborted(uint32 mapid, uint8 reason, uint8 arg) case TRANSFER_ABORT_INSUF_EXPAN_LVL: case TRANSFER_ABORT_DIFFICULTY: case TRANSFER_ABORT_UNIQUE_MESSAGE: + case TRANSFER_ABORT_ZONE_IN_COMBAT: + case TRANSFER_ABORT_MAX_PLAYERS: data << uint8(arg); break; } @@ -20289,9 +20291,9 @@ bool Player::RewardPlayerAndGroupAtKill(Unit* pVictim) void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewardSource) { - if (!pRewardSource) + if (!pRewardSource || pRewardSource->GetTypeId() != TYPEID_UNIT) return; - uint64 creature_guid = (pRewardSource && pRewardSource->GetTypeId()==TYPEID_UNIT) ? pRewardSource->GetGUID() : uint64(0); + uint64 creature_guid = pRewardSource->GetGUID(); // prepare data for near group iteration if(Group *pGroup = GetGroup()) @@ -20317,7 +20319,7 @@ void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewar bool Player::IsAtGroupRewardDistance(WorldObject const* pRewardSource) const { if (!pRewardSource) - return; + return false; const WorldObject* player = GetCorpse(); if(!player || isAlive()) player = this; |