aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-12 17:10:23 -0600
committermegamage <none@none>2009-03-12 17:10:23 -0600
commit17e0c43d20a644aa65df9364762952679ee1f7c6 (patch)
treee16d73561cf3110b310f8700c729836afc07d25a /src
parent4b82035006eef10efa5794da305488b838f16cd3 (diff)
*Fix a typo of that last rev.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/GridNotifiers.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/game/GridNotifiers.h b/src/game/GridNotifiers.h
index ba487dec55f..daa8296674a 100644
--- a/src/game/GridNotifiers.h
+++ b/src/game/GridNotifiers.h
@@ -600,14 +600,13 @@ namespace Trinity
AnyUnfriendlyNoTotemUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range) : i_obj(obj), i_funit(funit), i_range(range) {}
bool operator()(Unit* u)
{
- if(u->isAlive() && i_obj->IsWithinDistInMap(u, i_range) && !i_funit->IsFriendlyTo(u))
- {
- if (u->GetTypeId()==TYPEID_UNIT && !((Creature*)u)->isTotem())
- return false;
- return true;
- }
- else
+ if(!u->isAlive())
return false;
+
+ if(u->GetTypeId()==TYPEID_UNIT && ((Creature*)u)->isTotem())
+ return false;
+
+ return i_obj->IsWithinDistInMap(u, i_range) && !i_funit->IsFriendlyTo(u);
}
private:
WorldObject const* i_obj;