mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10016] Remove unused RewardSinglePlayerAtKill result.

Browse source
This commit is contained in:
VladimirMangos 2010-06-01 05:16:22 +04:00
parent 86439e14ad
commit 0a24a170d1
4 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/Player.cpp
View file

@ -20122,13 +20122,13 @@ bool Player::isHonorOrXPTarget(Unit* pVictim) const
return true; return true;
} }
bool Player::RewardSinglePlayerAtKill(Unit* pVictim) void Player::RewardSinglePlayerAtKill(Unit* pVictim)
{ {
bool PvP = pVictim->isCharmedOwnedByPlayerOrPlayer(); bool PvP = pVictim->isCharmedOwnedByPlayerOrPlayer();
uint32 xp = PvP ? 0 : MaNGOS::XP::Gain(this, pVictim); uint32 xp = PvP ? 0 : MaNGOS::XP::Gain(this, pVictim);
// honor can be in PvP and !PvP (racial leader) cases // 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 // xp and reputation only in !PvP case
if(!PvP) if(!PvP)
@ -20143,8 +20143,6 @@ bool Player::RewardSinglePlayerAtKill(Unit* pVictim)
if(pVictim->GetTypeId()==TYPEID_UNIT) if(pVictim->GetTypeId()==TYPEID_UNIT)
KilledMonster(((Creature*)pVictim)->GetCreatureInfo(), pVictim->GetObjectGuid()); KilledMonster(((Creature*)pVictim)->GetCreatureInfo(), pVictim->GetObjectGuid());
} }
return xp || honored_kill;
} }
void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewardSource) void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewardSource)

2
src/game/Player.h
View file

@ -1904,7 +1904,7 @@ class MANGOS_DLL_SPEC Player : public Unit
void InitDisplayIds(); void InitDisplayIds();
bool IsAtGroupRewardDistance(WorldObject const* pRewardSource) const; bool IsAtGroupRewardDistance(WorldObject const* pRewardSource) const;
bool RewardSinglePlayerAtKill(Unit* pVictim); void RewardSinglePlayerAtKill(Unit* pVictim);
void RewardPlayerAndGroupAtEvent(uint32 creature_id,WorldObject* pRewardSource); void RewardPlayerAndGroupAtEvent(uint32 creature_id,WorldObject* pRewardSource);
bool isHonorOrXPTarget(Unit* pVictim) const; bool isHonorOrXPTarget(Unit* pVictim) const;

2
src/game/SpellMgr.h
View file

@ -457,7 +457,7 @@ enum ProcFlags
PROC_FLAG_NONE = 0x00000000, PROC_FLAG_NONE = 0x00000000,
PROC_FLAG_KILLED = 0x00000001, // 00 Killed by aggressor 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_SUCCESSFUL_MELEE_HIT = 0x00000004, // 02 Successful melee auto attack
PROC_FLAG_TAKEN_MELEE_HIT = 0x00000008, // 03 Taken damage from melee auto attack hit PROC_FLAG_TAKEN_MELEE_HIT = 0x00000008, // 03 Taken damage from melee auto attack hit

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10015" #define REVISION_NR "10016"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__