Changeset 272 for trunk/src/bindings/scripts/ScriptMgr.cpp

Timestamp:

11/22/08 00:35:41 (17 years ago)

Author:

yumileroy

Message:

Delete possessed AI only on creature delete.

Original author: gvcoman
Date: 2008-11-16 14:38:02-05:00

Files:

• trunk/src/bindings/scripts/ScriptMgr.cpp (modified) (26 diffs)

trunk/src/bindings/scripts/ScriptMgr.cpp

@@ -18 +18 @@
 
 //*** Global data ***
-int num_db_scripts;
-int num_sc_scripts;
+int nrscripts;
 Script *m_scripts[MAX_SCRIPTS];
 
@@ -48 +47 @@
 // Text Maps
 UNORDERED_MAP<int32, StringTextData> TextMap;
+
 
 //*** End Global data ***
@@ -1181 +1181 @@
 TRINITY_DLL_EXPORT
 void ScriptsFree()
-{
+{   
     // Free Spell Summary
     delete []SpellSummary;
 
     // Free resources before library unload
-    for(int i=0;i<num_db_scripts;i++)
+    for(int i=0;i<nrscripts;i++)
         delete m_scripts[i];
 
-    num_db_scripts = 0;
-    num_sc_scripts = 0;
+    nrscripts = 0;
 }
 
@@ -1241 +1240 @@
         LoadDatabase();
 
-    num_db_scripts = GetScriptNames().size();
-
     outstring_log("TSCR: Loading C++ scripts");
     barGoLink bar(1);
@@ -1248 +1245 @@
     outstring_log("");
 
+    nrscripts = 0;
     for(int i=0;i<MAX_SCRIPTS;i++)
         m_scripts[i]=NULL;
@@ -1778 +1776 @@
     // -------------------
 
-    outstring_log(">> Loaded %i C++ Scripts (of %i ScriptNames defined in Mangos database)", num_sc_scripts, num_db_scripts);
+    outstring_log("TSCR: Loaded %u C++ Scripts", nrscripts);
+    outstring_log("");
 }
 
@@ -1850 +1849 @@
 //*** Functions used internally ***
 
-void Script::RegisterSelf()
-{
-    int id = GetScriptId(Name.c_str());
-    if (id != 0)
-    {
-        m_scripts[id] = this;
-        ++num_sc_scripts;
-    } else
-        debug_log("SD2: RegisterSelf, but script named %s does not have ScriptName assigned in database.",(this)->Name.c_str());
+TRINITY_DLL_EXPORT
+char const* ScriptsVersion()
+{
+        return "Default Trinity scripting library";
+}
+
+Script* GetScriptByName(std::string Name)
+{
+    if (Name.empty())
+        return NULL;
+
+    for(int i=0;i<MAX_SCRIPTS;i++)
+    {
+        if (m_scripts[i] && m_scripts[i]->Name == Name)
+            return m_scripts[i];
+    }
+    return NULL;
 }
 
@@ -1865 +1872 @@
 
 TRINITY_DLL_EXPORT
-char const* ScriptsVersion()
-{
-        return "Default Trinity scripting library";
-}
-TRINITY_DLL_EXPORT
 bool GossipHello ( Player * player, Creature *_Creature )
 {
-    Script *tmpscript = m_scripts[_Creature->GetScriptId()];
+    Script *tmpscript = GetScriptByName(_Creature->GetScriptName());
     if (!tmpscript || !tmpscript->pGossipHello) return false;
 
@@ -1884 +1886 @@
     debug_log("TSCR: Gossip selection, sender: %d, action: %d",sender, action);
 
-    Script *tmpscript = m_scripts[_Creature->GetScriptId()];
+    Script *tmpscript = GetScriptByName(_Creature->GetScriptName());
     if (!tmpscript || !tmpscript->pGossipSelect) return false;
 
@@ -1896 +1898 @@
     debug_log("TSCR: Gossip selection with code, sender: %d, action: %d",sender, action);
 
-    Script *tmpscript = m_scripts[_Creature->GetScriptId()];
+    Script *tmpscript = GetScriptByName(_Creature->GetScriptName());
     if (!tmpscript || !tmpscript->pGossipSelectWithCode) return false;
 
@@ -1906 +1908 @@
 bool QuestAccept( Player *player, Creature *_Creature, Quest const *_Quest )
 {
-    Script *tmpscript = m_scripts[_Creature->GetScriptId()];
+    Script *tmpscript = GetScriptByName(_Creature->GetScriptName());
     if (!tmpscript || !tmpscript->pQuestAccept) return false;
 
@@ -1916 +1918 @@
 bool QuestSelect( Player *player, Creature *_Creature, Quest const *_Quest )
 {
-    Script *tmpscript = m_scripts[_Creature->GetScriptId()];
+    Script *tmpscript = GetScriptByName(_Creature->GetScriptName());
     if (!tmpscript || !tmpscript->pQuestSelect) return false;
 
@@ -1926 +1928 @@
 bool QuestComplete( Player *player, Creature *_Creature, Quest const *_Quest )
 {
-    Script *tmpscript = m_scripts[_Creature->GetScriptId()];
+    Script *tmpscript = GetScriptByName(_Creature->GetScriptName());
     if (!tmpscript || !tmpscript->pQuestComplete) return false;
 
@@ -1936 +1938 @@
 bool ChooseReward( Player *player, Creature *_Creature, Quest const *_Quest, uint32 opt )
 {
-    Script *tmpscript = m_scripts[_Creature->GetScriptId()];
+    Script *tmpscript = GetScriptByName(_Creature->GetScriptName());
     if (!tmpscript || !tmpscript->pChooseReward) return false;
 
@@ -1946 +1948 @@
 uint32 NPCDialogStatus( Player *player, Creature *_Creature )
 {
-    Script *tmpscript = m_scripts[_Creature->GetScriptId()];
+    Script *tmpscript = GetScriptByName(_Creature->GetScriptName());
     if (!tmpscript || !tmpscript->pNPCDialogStatus) return 100;
 
@@ -1956 +1958 @@
 uint32 GODialogStatus( Player *player, GameObject *_GO )
 {
-    Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
-    if (!tmpscript || !tmpscript->pGODialogStatus) return 100;
+    Script *tmpscript = GetScriptByName(_GO->GetGOInfo()->ScriptName);
+    if(!tmpscript || !tmpscript->pGODialogStatus) return 100;
 
     player->PlayerTalkClass->ClearMenus();
@@ -1966 +1968 @@
 bool ItemHello( Player *player, Item *_Item, Quest const *_Quest )
 {
-    Script *tmpscript = m_scripts[_Item->GetProto()->ScriptId];
+    Script *tmpscript = GetScriptByName(_Item->GetProto()->ScriptName);
     if (!tmpscript || !tmpscript->pItemHello) return false;
 
@@ -1976 +1978 @@
 bool ItemQuestAccept( Player *player, Item *_Item, Quest const *_Quest )
 {
-    Script *tmpscript = m_scripts[_Item->GetProto()->ScriptId];
+    Script *tmpscript = GetScriptByName(_Item->GetProto()->ScriptName);
     if (!tmpscript || !tmpscript->pItemQuestAccept) return false;
 
@@ -1986 +1988 @@
 bool GOHello( Player *player, GameObject *_GO )
 {
-    Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
+    Script *tmpscript = GetScriptByName(_GO->GetGOInfo()->ScriptName);
     if (!tmpscript || !tmpscript->pGOHello) return false;
 
@@ -1996 +1998 @@
 bool GOQuestAccept( Player *player, GameObject *_GO, Quest const *_Quest )
 {
-    Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
+    Script *tmpscript = GetScriptByName(_GO->GetGOInfo()->ScriptName);
     if (!tmpscript || !tmpscript->pGOQuestAccept) return false;
 
@@ -2006 +2008 @@
 bool GOChooseReward( Player *player, GameObject *_GO, Quest const *_Quest, uint32 opt )
 {
-    Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
+    Script *tmpscript = GetScriptByName(_GO->GetGOInfo()->ScriptName);
     if (!tmpscript || !tmpscript->pGOChooseReward) return false;
 
@@ -2016 +2018 @@
 bool AreaTrigger( Player *player, AreaTriggerEntry * atEntry)
 {
-    Script *tmpscript = m_scripts[GetAreaTriggerScriptId(atEntry->id)];
+    Script *tmpscript = NULL;
+
+    tmpscript = GetScriptByName(GetAreaTriggerScriptNameById(atEntry->id));
     if (!tmpscript || !tmpscript->pAreaTrigger) return false;
 
@@ -2025 +2029 @@
 CreatureAI* GetAI(Creature *_Creature)
 {
-    Script *tmpscript = m_scripts[_Creature->GetScriptId()];
+    Script *tmpscript = GetScriptByName(_Creature->GetScriptName());
+
     if (!tmpscript || !tmpscript->GetAI) return NULL;
-
     return tmpscript->GetAI(_Creature);
 }
@@ -2034 +2038 @@
 bool ItemUse( Player *player, Item* _Item, SpellCastTargets const& targets)
 {
-    Script *tmpscript = m_scripts[_Item->GetProto()->ScriptId];
+    Script *tmpscript = GetScriptByName(_Item->GetProto()->ScriptName);
     if (!tmpscript || !tmpscript->pItemUse) return false;
 
@@ -2043 +2047 @@
 bool ReceiveEmote( Player *player, Creature *_Creature, uint32 emote )
 {
-    Script *tmpscript = m_scripts[_Creature->GetScriptId()];
+    Script *tmpscript = GetScriptByName(_Creature->GetScriptName());
     if (!tmpscript || !tmpscript->pReceiveEmote) return false;
 
@@ -2052 +2056 @@
 InstanceData* CreateInstanceData(Map *map)
 {
-    if (!map->IsDungeon()) return NULL;
-
-    Script *tmpscript = m_scripts[((InstanceMap*)map)->GetScriptId()];
-    if (!tmpscript || !tmpscript->GetInstanceData) return NULL;
+    Script *tmpscript = NULL;
+
+    if (!map->IsDungeon()) return false;
+
+    tmpscript = GetScriptByName(((InstanceMap*)map)->GetScript());
+    if (!tmpscript || !tmpscript->GetInstanceData) return false;
 
     return tmpscript->GetInstanceData(map);