From 4d008f2043084b72fb9d4a9929ff2793c7bbd8ee Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 4 Feb 2009 10:33:18 -0600 Subject: Replace tabs with spaces, and fix crlf issues --HG-- branch : trunk --- src/bindings/scripts/include/sc_creature.cpp | 16 ++++++++-------- src/bindings/scripts/include/sc_instance.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/bindings/scripts/include') diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index b4bb5175a8b..f9f9e04235e 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -136,7 +136,7 @@ void ScriptedAI::EnterEvadeMode() { if(owner->isAlive()) m_creature->GetMotionMaster()->MoveFollow(owner,PET_FOLLOW_DIST,PET_FOLLOW_ANGLE); - } + } else m_creature->GetMotionMaster()->MoveTargetedHome(); } @@ -434,7 +434,7 @@ void ScriptedAI::SelectUnitList(std::list &targetList, uint32 num, Select || playerOnly && target->GetTypeId() != TYPEID_PLAYER || dist && !m_creature->IsWithinCombatRange(target, dist)) { - continue; + continue; } targetList.push_back(target); --num; @@ -634,15 +634,15 @@ void FillSpellSummary() SpellSummary[i].Targets |= 1 << (SELECT_TARGET_ANY_FRIEND-1); //Make sure that this spell includes a damage effect - if ( TempSpell->Effect[j] == SPELL_EFFECT_SCHOOL_DAMAGE || - TempSpell->Effect[j] == SPELL_EFFECT_INSTAKILL || - TempSpell->Effect[j] == SPELL_EFFECT_ENVIRONMENTAL_DAMAGE || + if ( TempSpell->Effect[j] == SPELL_EFFECT_SCHOOL_DAMAGE || + TempSpell->Effect[j] == SPELL_EFFECT_INSTAKILL || + TempSpell->Effect[j] == SPELL_EFFECT_ENVIRONMENTAL_DAMAGE || TempSpell->Effect[j] == SPELL_EFFECT_HEALTH_LEECH ) SpellSummary[i].Effects |= 1 << (SELECT_EFFECT_DAMAGE-1); //Make sure that this spell includes a healing effect (or an apply aura with a periodic heal) - if ( TempSpell->Effect[j] == SPELL_EFFECT_HEAL || - TempSpell->Effect[j] == SPELL_EFFECT_HEAL_MAX_HEALTH || + if ( TempSpell->Effect[j] == SPELL_EFFECT_HEAL || + TempSpell->Effect[j] == SPELL_EFFECT_HEAL_MAX_HEALTH || TempSpell->Effect[j] == SPELL_EFFECT_HEAL_MECHANICAL || (TempSpell->Effect[j] == SPELL_EFFECT_APPLY_AURA && TempSpell->EffectApplyAuraName[j]== 8 )) SpellSummary[i].Effects |= 1 << (SELECT_EFFECT_HEALING-1); @@ -746,7 +746,7 @@ void ScriptedAI::DoTeleportAll(float x, float y, float z, float o) } Unit* FindCreature(uint32 entry, float range, Unit* Finder) -{ +{ if(!Finder) return NULL; Creature* target = NULL; diff --git a/src/bindings/scripts/include/sc_instance.h b/src/bindings/scripts/include/sc_instance.h index 8ecd982f5cb..c02b05fa709 100644 --- a/src/bindings/scripts/include/sc_instance.h +++ b/src/bindings/scripts/include/sc_instance.h @@ -38,7 +38,7 @@ class TRINITY_DLL_DECL ScriptedInstance : public InstanceData virtual void Update(uint32) {} // Save and Load instance data to the database - const char* Save() { return NULL; } + const char* Save() { return NULL; } void Load(const char* in) { } }; -- cgit v1.2.3