diff options
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/BattleGround.h | 6 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/game/BattleGround.h b/src/game/BattleGround.h index 4ed660a3595..467798d7890 100644 --- a/src/game/BattleGround.h +++ b/src/game/BattleGround.h @@ -53,6 +53,12 @@ enum BattleGroundQuests enum BattleGroundMarks { + SPELL_WS_MARK_LOSER = 24950, + SPELL_WS_MARK_WINNER = 24951, + SPELL_AB_MARK_LOSER = 24952, + SPELL_AB_MARK_WINNER = 24953, + SPELL_AV_MARK_LOSER = 24954, + SPELL_AV_MARK_WINNER = 24955, ITEM_AV_MARK_OF_HONOR = 20560, ITEM_WS_MARK_OF_HONOR = 20558, ITEM_AB_MARK_OF_HONOR = 20559, diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 364fa8a741f..2fb789fca16 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -663,9 +663,10 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa if(cInfo && cInfo->lootid) pVictim->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); - // some critters required for quests + // some critters required for quests (need normal entry instead possible heroic in any cases) if(GetTypeId() == TYPEID_PLAYER) - ((Player*)this)->KilledMonster(cInfo ,pVictim->GetGUID()); + if(CreatureInfo const* normalInfo = objmgr.GetCreatureTemplate(pVictim->GetEntry())) + ((Player*)this)->KilledMonster(normalInfo,pVictim->GetGUID()); } else pVictim->ModifyHealth(- (int32)damage); |