diff options
Diffstat (limited to 'src/bindings/scripts/include')
-rw-r--r-- | src/bindings/scripts/include/sc_creature.cpp | 18 | ||||
-rw-r--r-- | src/bindings/scripts/include/sc_instance.h | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index 6ffa4261488..6c9a0059b11 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -221,12 +221,12 @@ void ScriptedAI::DoCastSpell(Unit* who,SpellEntry const *spellInfo, bool trigger void ScriptedAI::DoSay(const char* text, uint32 language, Unit* target, bool SayEmote) { - if (target) - { - m_creature->Say(text, language, target->GetGUID()); - if(SayEmote) - m_creature->HandleEmoteCommand(EMOTE_ONESHOT_TALK); - } + if (target) + { + m_creature->Say(text, language, target->GetGUID()); + if(SayEmote) + m_creature->HandleEmoteCommand(EMOTE_ONESHOT_TALK); + } else m_creature->Say(text, language, 0); } @@ -751,8 +751,8 @@ Unit* FindCreature(uint32 entry, float range, Unit* Finder) if(!Finder) return NULL; Creature* target = NULL; - Trinity::AllCreaturesOfEntryInRange check(Finder, entry, range); - Trinity::CreatureSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(target, check); + Trinity::AllCreaturesOfEntryInRange check(Finder, entry, range); + Trinity::CreatureSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(target, check); Finder->VisitNearbyObject(range, searcher); return target; } @@ -762,7 +762,7 @@ GameObject* FindGameObject(uint32 entry, float range, Unit* Finder) if(!Finder) return NULL; GameObject* target = NULL; - Trinity::AllGameObjectsWithEntryInGrid go_check(entry); + Trinity::AllGameObjectsWithEntryInGrid go_check(entry); Trinity::GameObjectSearcher<Trinity::AllGameObjectsWithEntryInGrid> searcher(target, go_check); Finder->VisitNearbyGridObject(range, searcher); return target; diff --git a/src/bindings/scripts/include/sc_instance.h b/src/bindings/scripts/include/sc_instance.h index c02b05fa709..59c19bda085 100644 --- a/src/bindings/scripts/include/sc_instance.h +++ b/src/bindings/scripts/include/sc_instance.h @@ -14,7 +14,7 @@ enum EncounterState IN_PROGRESS = 1, FAIL = 2, DONE = 3, - SPECIAL = 4 + SPECIAL = 4 }; #define OUT_SAVE_INST_DATA debug_log("SD2: Saving Instance Data for Instance %s (Map %d, Instance Id %d)", instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) |