diff options
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 37 |
1 files changed, 29 insertions, 8 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index c72d88c24ad..763ae5daf4c 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -1,5 +1,7 @@ /* - * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * Thanks to the original authors: MaNGOS <http://www.mangosproject.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -8,12 +10,12 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "Common.h" @@ -39,6 +41,7 @@ #include "Util.h" #include "Totem.h" #include "BattleGround.h" +#include "OutdoorPvP.h" #include "InstanceSaveMgr.h" #include "GridNotifiersImpl.h" #include "CellImpl.h" @@ -634,6 +637,24 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa if(!spiritOfRedemtionTalentReady) pVictim->setDeathState(JUST_DIED); + // outdoor pvp things, do these after setting the death state, else the player activity notify won't work... doh... + // handle player kill only if not suicide (spirit of redemption for example) + if(GetTypeId() == TYPEID_PLAYER && this != pVictim) + { + if(OutdoorPvP * pvp = ((Player*)this)->GetOutdoorPvP()) + { + pvp->HandleKill((Player*)this,pVictim); + } + } + + if(pVictim->GetTypeId() == TYPEID_PLAYER) + { + if(OutdoorPvP * pvp = ((Player*)pVictim)->GetOutdoorPvP()) + { + pvp->HandlePlayerActivityChanged((Player*)pVictim); + } + } + DEBUG_LOG("DealDamageHealth1"); if(spiritOfRedemtionTalentReady) @@ -10567,7 +10588,7 @@ void Unit::UpdateReactives( uint32 p_time ) Unit* Unit::SelectNearbyTarget() const { - CellPair p(MaNGOS::ComputeCellPair(GetPositionX(), GetPositionY())); + CellPair p(Trinity::ComputeCellPair(GetPositionX(), GetPositionY())); Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); @@ -10575,11 +10596,11 @@ Unit* Unit::SelectNearbyTarget() const std::list<Unit *> targets; { - MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck u_check(this, this, ATTACK_DISTANCE); - MaNGOS::UnitListSearcher<MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck> searcher(targets, u_check); + Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(this, this, ATTACK_DISTANCE); + Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(targets, u_check); - TypeContainerVisitor<MaNGOS::UnitListSearcher<MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck>, WorldTypeMapContainer > world_unit_searcher(searcher); - TypeContainerVisitor<MaNGOS::UnitListSearcher<MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck>, GridTypeMapContainer > grid_unit_searcher(searcher); + TypeContainerVisitor<Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck>, WorldTypeMapContainer > world_unit_searcher(searcher); + TypeContainerVisitor<Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck>, GridTypeMapContainer > grid_unit_searcher(searcher); CellLock<GridReadGuard> cell_lock(cell, p); cell_lock->Visit(cell_lock, world_unit_searcher, *MapManager::Instance().GetMap(GetMapId(), this)); |