diff options
| author | megamage <none@none> | 2009-02-12 17:09:15 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-12 17:09:15 -0600 |
| commit | 6aee5fcbe7473a3cbac12b7e8482a7b98bef8be3 (patch) | |
| tree | 91ec91d5c19eba9c2fe0e84b1c9dc7047a3de80e /src/bindings/scripts/include | |
| parent | 2d2f433b4de1c35b22aaf07854fc0ee11fcb350d (diff) | |
| parent | f385747164c3fb278c92ef46fbd6c3da6590bbf0 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/bindings/scripts/include')
| -rw-r--r-- | src/bindings/scripts/include/sc_creature.cpp | 16 | ||||
| -rw-r--r-- | src/bindings/scripts/include/sc_instance.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index 6d68e203352..8764f612557 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); } @@ -749,7 +749,7 @@ Unit* FindCreature(uint32 entry, float range, Unit* Finder) if(!Finder) return NULL; Creature* target = NULL; - Trinity::AllCreaturesOfEntryInRange check(Finder, entry, range); + Trinity::AllCreaturesOfEntryInRange check(Finder, entry, range); Trinity::CreatureSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(Finder, target, check); Finder->VisitNearbyObject(range, searcher); return target; @@ -760,7 +760,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(Finder, 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()) |