From 231720c10fcca8fc1a74742a328de1cf7e050a9b Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Fri, 19 Feb 2010 17:54:22 +0300 Subject: [PATCH] [9414] Some lost changes for prev. commit. --- src/game/ScriptCalls.h | 7 ++++--- src/game/SpellEffects.cpp | 2 +- src/shared/revision_nr.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/game/ScriptCalls.h b/src/game/ScriptCalls.h index f3f5d43c7..6a4c75298 100644 --- a/src/game/ScriptCalls.h +++ b/src/game/ScriptCalls.h @@ -21,6 +21,7 @@ #include "Common.h" #include "ObjectMgr.h" +#include "DBCEnums.h" class Creature; class CreatureAI; @@ -55,9 +56,9 @@ typedef bool(MANGOS_IMPORT * scriptCallItemQuestAccept)(Player *player, Item *, typedef bool(MANGOS_IMPORT * scriptCallGOQuestAccept)(Player *player, GameObject *, Quest const*); typedef bool(MANGOS_IMPORT * scriptCallGOChooseReward)(Player *player, GameObject *, Quest const*, uint32 opt ); typedef bool(MANGOS_IMPORT * scriptCallItemUse) (Player *player, Item *_Item, SpellCastTargets const& targets); -typedef bool(MANGOS_IMPORT * scriptCallEffectDummyGameObj) (Unit *caster, uint32 spellId, uint32 effIndex, GameObject *gameObjTarget); -typedef bool(MANGOS_IMPORT * scriptCallEffectDummyCreature) (Unit *caster, uint32 spellId, uint32 effIndex, Creature *crTarget); -typedef bool(MANGOS_IMPORT * scriptCallEffectDummyItem) (Unit *caster, uint32 spellId, uint32 effIndex, Item *itemTarget); +typedef bool(MANGOS_IMPORT * scriptCallEffectDummyGameObj) (Unit *caster, uint32 spellId, SpellEffectIndex effIndex, GameObject *gameObjTarget); +typedef bool(MANGOS_IMPORT * scriptCallEffectDummyCreature) (Unit *caster, uint32 spellId, SpellEffectIndex effIndex, Creature *crTarget); +typedef bool(MANGOS_IMPORT * scriptCallEffectDummyItem) (Unit *caster, uint32 spellId, SpellEffectIndex effIndex, Item *itemTarget); typedef CreatureAI* (MANGOS_IMPORT * scriptCallGetAI) ( Creature *_Creature ); typedef InstanceData* (MANGOS_IMPORT * scriptCallCreateInstanceData) (Map *map); diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 9a88a6be3..6d618b2ba 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -2091,7 +2091,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx) } // Script based implementation. Must be used only for not good for implementation in core spell effects - // So called only for not proccessed cases + // So called only for not processed cases if (gameObjTarget) Script->EffectDummyGameObj(m_caster, m_spellInfo->Id, eff_idx, gameObjTarget); else if (unitTarget && unitTarget->GetTypeId()==TYPEID_UNIT) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b61b2038e..3f21ab039 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9413" + #define REVISION_NR "9414" #endif // __REVISION_NR_H__