From 0a24a170d182da13bef0722e6adab4435f65e03d Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Tue, 1 Jun 2010 05:16:22 +0400 Subject: [PATCH] [10016] Remove unused RewardSinglePlayerAtKill result. --- src/game/Player.cpp | 6 ++---- src/game/Player.h | 2 +- src/game/SpellMgr.h | 2 +- src/shared/revision_nr.h | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 7513657d7..bccc778ae 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -20122,13 +20122,13 @@ bool Player::isHonorOrXPTarget(Unit* pVictim) const return true; } -bool Player::RewardSinglePlayerAtKill(Unit* pVictim) +void Player::RewardSinglePlayerAtKill(Unit* pVictim) { bool PvP = pVictim->isCharmedOwnedByPlayerOrPlayer(); uint32 xp = PvP ? 0 : MaNGOS::XP::Gain(this, pVictim); // honor can be in PvP and !PvP (racial leader) cases - bool honored_kill = RewardHonor(pVictim,1); + RewardHonor(pVictim,1); // xp and reputation only in !PvP case if(!PvP) @@ -20143,8 +20143,6 @@ bool Player::RewardSinglePlayerAtKill(Unit* pVictim) if(pVictim->GetTypeId()==TYPEID_UNIT) KilledMonster(((Creature*)pVictim)->GetCreatureInfo(), pVictim->GetObjectGuid()); } - - return xp || honored_kill; } void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewardSource) diff --git a/src/game/Player.h b/src/game/Player.h index cdf20bb19..0e4f35e90 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -1904,7 +1904,7 @@ class MANGOS_DLL_SPEC Player : public Unit void InitDisplayIds(); bool IsAtGroupRewardDistance(WorldObject const* pRewardSource) const; - bool RewardSinglePlayerAtKill(Unit* pVictim); + void RewardSinglePlayerAtKill(Unit* pVictim); void RewardPlayerAndGroupAtEvent(uint32 creature_id,WorldObject* pRewardSource); bool isHonorOrXPTarget(Unit* pVictim) const; diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h index 2956bb2e8..0108e78d3 100644 --- a/src/game/SpellMgr.h +++ b/src/game/SpellMgr.h @@ -457,7 +457,7 @@ enum ProcFlags PROC_FLAG_NONE = 0x00000000, PROC_FLAG_KILLED = 0x00000001, // 00 Killed by aggressor - PROC_FLAG_KILL = 0x00000002, // 01 Kill target (in most cases need XP/Honor reward) + PROC_FLAG_KILL = 0x00000002, // 01 Kill target (in most cases need XP/Honor reward, see Unit::IsTriggeredAtSpellProcEvent for additinoal check) PROC_FLAG_SUCCESSFUL_MELEE_HIT = 0x00000004, // 02 Successful melee auto attack PROC_FLAG_TAKEN_MELEE_HIT = 0x00000008, // 03 Taken damage from melee auto attack hit diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 3eb7cf511..ac4949acf 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10015" + #define REVISION_NR "10016" #endif // __REVISION_NR_H__