Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-12 17:09:15 -06:00
parent 2d2f433b4d f385747164
commit 6aee5fcbe7
603 changed files with 40989 additions and 40987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/bindings/scripts/include/sc_creature.cpp
View File

@@ -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;

2
src/bindings/scripts/include/sc_instance.h
View File

@@ -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())