diff options
| author | Rat <none@none> | 2010-01-19 11:36:05 +0100 |
|---|---|---|
| committer | Rat <none@none> | 2010-01-19 11:36:05 +0100 |
| commit | 0cc053ea4d42ce405a915857f75ee00f0f65666b (patch) | |
| tree | 7c25955ee5db618deee963f515ba061fbb1e1e8c /src/game/SpellEffects.cpp | |
| parent | f5dea61b66a616110cfc82ff640ec448b1efa702 (diff) | |
*Integrate Script system to Core
-added ScriptMgr for loading scripts
-removed bindings
-moved script system to src/game
-moved scripts to src/scripts
-VC project files updated
-cmakes updated (not 100% done yet)
NOTE to Devs:
-file locations changed
-precompiled renamed to ScriptedPch
-ecsort_ai renamed to ScriptedEscortAI
-follower_ai renamed to ScriptedFollowerAI
-guard_ai renamed to ScriptedGuardAI
-simple_ai renamed to ScriptedSimpleAI
-sc_creature renamed to ScriptedCreature
-sc_gossip renamed to ScriptedGossip
-sc_instance renamed to ScriptedInstance
*use the new headers in scripts, thank you
NOTE to ALL:
cmake not fully tested, please report any errors with it
could make creashes, incompability
USE AT YOUR OWN RISK before further tests!!
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellEffects.cpp')
| -rw-r--r-- | src/game/SpellEffects.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 76f2af18c50..efe742087c6 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -63,6 +63,7 @@ #include "SkillDiscovery.h" #include "Formulas.h" #include "Vehicle.h" +#include "ScriptMgr.h" pEffect SpellEffects[TOTAL_SPELL_EFFECTS]= { @@ -2145,11 +2146,11 @@ void Spell::EffectDummy(uint32 i) // Script based implementation. Must be used only for not good for implementation in core spell effects // So called only for not proccessed cases if(gameObjTarget) - Script->EffectDummyGameObj(m_caster, m_spellInfo->Id, i, gameObjTarget); + sScriptMgr.EffectDummyGameObj(m_caster, m_spellInfo->Id, i, gameObjTarget); else if(unitTarget && unitTarget->GetTypeId() == TYPEID_UNIT) - Script->EffectDummyCreature(m_caster, m_spellInfo->Id, i, (Creature*)unitTarget); + sScriptMgr.EffectDummyCreature(m_caster, m_spellInfo->Id, i, (Creature*)unitTarget); else if(itemTarget) - Script->EffectDummyItem(m_caster, m_spellInfo->Id, i, itemTarget); + sScriptMgr.EffectDummyItem(m_caster, m_spellInfo->Id, i, itemTarget); } void Spell::EffectTriggerSpellWithValue(uint32 i) @@ -3254,7 +3255,7 @@ void Spell::SendLoot(uint64 guid, LootType loottype) if (gameObjTarget) { - if (Script->GOHello(player, gameObjTarget)) + if (sScriptMgr.GOHello(player, gameObjTarget)) return; switch (gameObjTarget->GetGoType()) |
