Skip to content

Commit

Permalink
[9413] Use SpellEffectIndex in EffectDummy* script calls.
Browse files Browse the repository at this point in the history 
Scripts used this script calls will need update...
  • Loading branch information
VladimirMangos committed Feb 19, 2010
1 parent 501cb3b commit a805f2b
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 75 deletions.
155 changes: 84 additions & 71 deletions src/bindings/universal/ScriptMgr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ extern void AddSC_default();
MANGOS_DLL_EXPORT
void ScriptsFree()
{ // Free resources before library unload
for(int i=0;i<nrscripts;i++)
for(int i = 0; i < nrscripts; ++i)
delete m_scripts[i];

nrscripts = 0;
Expand All @@ -45,10 +45,8 @@ MANGOS_DLL_EXPORT
void ScriptsInit()
{
nrscripts = GetScriptNames().size();
for(int i=0;i<MAX_SCRIPTS;i++)
{
m_scripts[i]=NULL;
}
for(int i = 0; i < MAX_SCRIPTS; ++i)
m_scripts[i]=NULL;

// -- Inicialize the Scripts to be Added --
AddSC_default();
Expand All @@ -64,17 +62,19 @@ char const* ScriptsVersion()

void Script::registerSelf()
{
int id = GetScriptId(Name.c_str());
if(id != 0) m_scripts[id] = this;
if (int id = GetScriptId(Name.c_str()))
m_scripts[id] = this;
}

MANGOS_DLL_EXPORT
bool GossipHello ( Player * player, Creature *_Creature )
{
Script *tmpscript = m_scripts[_Creature->GetScriptId()];
if(!tmpscript || !tmpscript->pGossipHello) return false;
if (!tmpscript || !tmpscript->pGossipHello)
return false;

player->PlayerTalkClass->ClearMenus();

return tmpscript->pGossipHello(player,_Creature);
}

Expand All @@ -84,9 +84,11 @@ bool GossipSelect( Player *player, Creature *_Creature,uint32 sender, uint32 act
debug_log("DEBUG: Gossip selection, sender: %d, action: %d",sender, action);

Script *tmpscript = m_scripts[_Creature->GetScriptId()];
if(!tmpscript || !tmpscript->pGossipSelect) return false;
if (!tmpscript || !tmpscript->pGossipSelect)
return false;

player->PlayerTalkClass->ClearMenus();

return tmpscript->pGossipSelect(player,_Creature,sender,action);
}

Expand All @@ -96,129 +98,140 @@ bool GossipSelectWithCode( Player *player, Creature *_Creature, uint32 sender, u
debug_log("DEBUG: Gossip selection, sender: %d, action: %d",sender, action);

Script *tmpscript = m_scripts[_Creature->GetScriptId()];
if(!tmpscript || !tmpscript->pGossipSelectWithCode) return false;
if (!tmpscript || !tmpscript->pGossipSelectWithCode)
return false;

player->PlayerTalkClass->ClearMenus();

return tmpscript->pGossipSelectWithCode(player,_Creature,sender,action,sCode);
}

MANGOS_DLL_EXPORT
bool QuestAccept( Player *player, Creature *_Creature, Quest *_Quest )
{
Script *tmpscript = m_scripts[_Creature->GetScriptId()];
if(!tmpscript || !tmpscript->pQuestAccept) return false;
if (!tmpscript || !tmpscript->pQuestAccept)
return false;

player->PlayerTalkClass->ClearMenus();

return tmpscript->pQuestAccept(player,_Creature,_Quest);
}

MANGOS_DLL_EXPORT
bool QuestSelect( Player *player, Creature *_Creature, Quest *_Quest )
{
Script *tmpscript = m_scripts[_Creature->GetScriptId()];
if(!tmpscript || !tmpscript->pQuestSelect) return false;
if (!tmpscript || !tmpscript->pQuestSelect)
return false;

player->PlayerTalkClass->ClearMenus();

return tmpscript->pQuestSelect(player,_Creature,_Quest);
}

MANGOS_DLL_EXPORT
bool QuestComplete( Player *player, Creature *_Creature, Quest *_Quest )
{
Script *tmpscript = m_scripts[_Creature->GetScriptId()];
if(!tmpscript || !tmpscript->pQuestComplete) return false;
if (!tmpscript || !tmpscript->pQuestComplete)
return false;

player->PlayerTalkClass->ClearMenus();

return tmpscript->pQuestComplete(player,_Creature,_Quest);
}

MANGOS_DLL_EXPORT
bool ChooseReward( Player *player, Creature *_Creature, Quest *_Quest, uint32 opt )
{
Script *tmpscript = m_scripts[_Creature->GetScriptId()];
if(!tmpscript || !tmpscript->pChooseReward) return false;
if (!tmpscript || !tmpscript->pChooseReward)
return false;

player->PlayerTalkClass->ClearMenus();

return tmpscript->pChooseReward(player,_Creature,_Quest,opt);
}

MANGOS_DLL_EXPORT
uint32 NPCDialogStatus( Player *player, Creature *_Creature )
{
Script *tmpscript = m_scripts[_Creature->GetScriptId()];
if(!tmpscript || !tmpscript->pNPCDialogStatus) return 100;
if (!tmpscript || !tmpscript->pNPCDialogStatus)
return 100;

player->PlayerTalkClass->ClearMenus();

return tmpscript->pNPCDialogStatus(player,_Creature);
}

MANGOS_DLL_EXPORT
uint32 GODialogStatus( Player *player, GameObject *_GO )
{
Script *tmpscript = NULL;

tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
if(!tmpscript || !tmpscript->pGODialogStatus) return 100;
Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
if (!tmpscript || !tmpscript->pGODialogStatus)
return 100;

player->PlayerTalkClass->ClearMenus();

return tmpscript->pGODialogStatus(player,_GO);
}

MANGOS_DLL_EXPORT
bool ItemHello( Player *player, Item *_Item, Quest *_Quest )
{
Script *tmpscript = NULL;

tmpscript = m_scripts[_Item->GetProto()->ScriptId];
if(!tmpscript || !tmpscript->pItemHello) return false;
Script *tmpscript = m_scripts[_Item->GetProto()->ScriptId];
if (!tmpscript || !tmpscript->pItemHello)
return false;

player->PlayerTalkClass->ClearMenus();

return tmpscript->pItemHello(player,_Item,_Quest);
}

MANGOS_DLL_EXPORT
bool ItemQuestAccept( Player *player, Item *_Item, Quest *_Quest )
{
Script *tmpscript = NULL;

tmpscript = m_scripts[_Item->GetProto()->ScriptId];
if(!tmpscript || !tmpscript->pItemQuestAccept) return false;
Script *tmpscript = m_scripts[_Item->GetProto()->ScriptId];
if (!tmpscript || !tmpscript->pItemQuestAccept)
return false;

player->PlayerTalkClass->ClearMenus();

return tmpscript->pItemQuestAccept(player,_Item,_Quest);
}

MANGOS_DLL_EXPORT
bool GOHello( Player *player, GameObject *_GO )
{
Script *tmpscript = NULL;

tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
if(!tmpscript || !tmpscript->pGOHello) return false;
Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
if (!tmpscript || !tmpscript->pGOHello)
return false;

player->PlayerTalkClass->ClearMenus();

return tmpscript->pGOHello(player,_GO);
}

MANGOS_DLL_EXPORT
bool GOQuestAccept( Player *player, GameObject *_GO, Quest *_Quest )
{
Script *tmpscript = NULL;

tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
if(!tmpscript || !tmpscript->pGOQuestAccept) return false;
Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
if (!tmpscript || !tmpscript->pGOQuestAccept)
return false;

player->PlayerTalkClass->ClearMenus();

return tmpscript->pGOQuestAccept(player,_GO,_Quest);
}

MANGOS_DLL_EXPORT
bool GOChooseReward( Player *player, GameObject *_GO, Quest *_Quest, uint32 opt )
{
Script *tmpscript = NULL;

tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
if(!tmpscript || !tmpscript->pGOChooseReward) return false;
Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
if (!tmpscript || !tmpscript->pGOChooseReward)
return false;

player->PlayerTalkClass->ClearMenus();
return tmpscript->pGOChooseReward(player,_GO,_Quest,opt);
Expand All @@ -227,21 +240,19 @@ bool GOChooseReward( Player *player, GameObject *_GO, Quest *_Quest, uint32 opt
MANGOS_DLL_EXPORT
bool AreaTrigger ( Player *player, AreaTriggerEntry* atEntry )
{
Script *tmpscript = NULL;

tmpscript = m_scripts[GetAreaTriggerScriptId(atEntry->id)];
if(!tmpscript || !tmpscript->pAreaTrigger) return false;
Script *tmpscript = m_scripts[GetAreaTriggerScriptId(atEntry->id)];
if (!tmpscript || !tmpscript->pAreaTrigger)
return false;

return tmpscript->pAreaTrigger(player, atEntry);
}

MANGOS_DLL_EXPORT
bool ItemUse( Player *player, Item* _Item, SpellCastTargets const& targets)
{
Script *tmpscript = NULL;

tmpscript = m_scripts[_Item->GetProto()->ScriptId];
if(!tmpscript || !tmpscript->pItemUse) return false;
Script *tmpscript = m_scripts[_Item->GetProto()->ScriptId];
if (!tmpscript || !tmpscript->pItemUse)
return false;

return tmpscript->pItemUse(player,_Item,targets);
}
Expand All @@ -250,60 +261,64 @@ MANGOS_DLL_EXPORT
CreatureAI* GetAI(Creature *_Creature )
{
Script *tmpscript = m_scripts[_Creature->GetScriptId()];
if(!tmpscript || !tmpscript->GetAI) return NULL;
if (!tmpscript || !tmpscript->GetAI)
return NULL;

return tmpscript->GetAI(_Creature);
}

MANGOS_DLL_EXPORT
InstanceData* CreateInstanceData(Map *map)
{
if(!map->IsDungeon()) return NULL;
if (!map->IsDungeon())
return NULL;

Script *tmpscript = m_scripts[((InstanceMap*)map)->GetScriptId()];
if(!tmpscript || !tmpscript->GetInstanceData) return NULL;
if (!tmpscript || !tmpscript->GetInstanceData)
return NULL;

return tmpscript->GetInstanceData(map);
}

MANGOS_DLL_EXPORT
bool EffectDummyGameObj(Unit *caster, uint32 spellId, uint32 effIndex, GameObject *gameObjTarget )
bool EffectDummyGameObj(Unit *caster, uint32 spellId, SpellEffectIndex effIndex, GameObject *gameObjTarget )
{
Script *tmpscript = m_scripts[gameObjTarget->GetGOInfo()->ScriptId];
if (!tmpscript || !tmpscript->pEffectDummyGameObj)
return false;

if (!tmpscript || !tmpscript->pEffectDummyGameObj) return false;

return tmpscript->pEffectDummyGameObj(caster, spellId,effIndex,gameObjTarget);
return tmpscript->pEffectDummyGameObj(caster, spellId, effIndex, gameObjTarget);
}

MANGOS_DLL_EXPORT
bool EffectDummyCreature(Unit *caster, uint32 spellId, uint32 effIndex, Creature *crTarget )
bool EffectDummyCreature(Unit *caster, uint32 spellId, SpellEffectIndex effIndex, Creature *crTarget )
{
Script *tmpscript = m_scripts[crTarget->GetScriptId()];
if (!tmpscript || !tmpscript->pEffectDummyCreature)
return false;

if (!tmpscript || !tmpscript->pEffectDummyCreature) return false;

return tmpscript->pEffectDummyCreature(caster, spellId,effIndex,crTarget);
return tmpscript->pEffectDummyCreature(caster, spellId, effIndex, crTarget);
}

MANGOS_DLL_EXPORT
bool EffectDummyItem(Unit *caster, uint32 spellId, uint32 effIndex, Item *itemTarget )
bool EffectDummyItem(Unit *caster, uint32 spellId, SpellEffectIndex effIndex, Item *itemTarget )
{
Script *tmpscript = m_scripts[itemTarget->GetProto()->ScriptId];
if (!tmpscript || !tmpscript->pEffectDummyItem)
return false;

if (!tmpscript || !tmpscript->pEffectDummyItem) return false;

return tmpscript->pEffectDummyItem(caster, spellId,effIndex,itemTarget);
return tmpscript->pEffectDummyItem(caster, spellId, effIndex, itemTarget);
}

void ScriptedAI::UpdateAI(const uint32)
{
//Check if we have a current target
if( m_creature->isAlive() && m_creature->SelectHostileTarget() && m_creature->getVictim())
if (m_creature->isAlive() && m_creature->SelectHostileTarget() && m_creature->getVictim())
{
//If we are within range melee the target
if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
if (m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
{
if( m_creature->isAttackReady() )
if (m_creature->isAttackReady())
{
m_creature->AttackerStateUpdate(m_creature->getVictim());
m_creature->resetAttackTimer();
Expand All @@ -315,26 +330,24 @@ void ScriptedAI::UpdateAI(const uint32)
void ScriptedAI::EnterEvadeMode()
{
m_creature->CombatStop(true);
if( m_creature->isAlive() )
if (m_creature->isAlive())
DoGoHome();
}

void ScriptedAI::DoStartAttack(Unit* victim)
{
if( m_creature->Attack(victim, true) )
if (m_creature->Attack(victim, true))
m_creature->GetMotionMaster()->MoveChase(victim);
}

void ScriptedAI::DoStopAttack()
{
if( m_creature->getVictim() != NULL )
{
if (m_creature->getVictim() != NULL)
m_creature->AttackStop();
}
}

void ScriptedAI::DoGoHome()
{
if( !m_creature->getVictim() && m_creature->isAlive() )
if (!m_creature->getVictim() && m_creature->isAlive())
m_creature->GetMotionMaster()->MoveTargetedHome();
}
6 changes: 3 additions & 3 deletions src/bindings/universal/ScriptMgr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ struct Script
bool (*pGOQuestAccept )(Player *player, GameObject *_GO, Quest const*_Quest );
bool (*pGOChooseReward )(Player *player, GameObject *_GO, Quest const*_Quest, uint32 opt );
bool (*pItemUse )(Player *player, Item* _Item, SpellCastTargets const& targets);
bool (*pEffectDummyGameObj )(Unit*, uint32, uint32, GameObject* );
bool (*pEffectDummyCreature )(Unit*, uint32, uint32, Creature* );
bool (*pEffectDummyItem )(Unit*, uint32, uint32, Item* );
bool (*pEffectDummyGameObj )(Unit*, uint32, SpellEffectIndex, GameObject* );
bool (*pEffectDummyCreature )(Unit*, uint32, SpellEffectIndex, Creature* );
bool (*pEffectDummyItem )(Unit*, uint32, SpellEffectIndex, Item* );

CreatureAI* (*GetAI)(Creature *_Creature);
InstanceData* (*GetInstanceData)(Map*);
Expand Down
2 changes: 1 addition & 1 deletion src/shared/revision_nr.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "9412"
#define REVISION_NR "9413"
#endif // __REVISION_NR_H__

0 comments on commit a805f2b

Please sign in to comment.