Changeset 173 for trunk/src/game/Spell.cpp

Timestamp:

11/19/08 13:43:02 (17 years ago)

Author:

yumileroy

Message:

[svn] * Avoid access to bag item prototype for getting bag size, use related item update field instead as more fast source.
* Better check client inventory pos data received in some client packets to skip invalid cases.
* Removed some unnecessary database queries.
* Make guid lookup for adding ignore async.
* Added two parameter versions of the AsyncQuery? function
* Make queries for adding friends async. - Hunuza
* Replace some PQuery() calls with more simple Query() - Hunuza
* Mark spell as executed instead of deleteable to solve crash.
*** Source mangos.

**Its a big commit. so test with care... or without care.... whatever floats your boat.

Original author: KingPin?
Date: 2008-11-05 20:10:19-06:00

Files:

• trunk/src/game/Spell.cpp (modified) (8 diffs)

trunk/src/game/Spell.cpp

@@ -288 +288 @@
     m_magnetPair.first = false;
     m_magnetPair.second = NULL;
-    m_deletable = true;
+    m_referencedFromCurrentSpell = false;
+    m_executedCurrently = false;
     m_delayAtDamageCount = 0;
 
@@ -2202 +2203 @@
 void Spell::cast(bool skipCheck)
 {
+    SetExecutedCurrently(true);
+    
     uint8 castResult = 0;
 
@@ -2211 +2214 @@
     {
         cancel();
+        SetExecutedCurrently(false);
         return;
     }
@@ -2222 +2226 @@
         SendCastResult(castResult);
         finish(false);
+        SetExecutedCurrently(false);
         return;
     }
@@ -2233 +2238 @@
             SendCastResult(castResult);
             finish(false);
+            SetExecutedCurrently(false);
             return;
         }
@@ -2278 +2284 @@
 
     if(m_spellState == SPELL_STATE_FINISHED)                // stop cast if spell marked as finish somewhere in Take*/FillTargetMap
-        return;
+    {
+        SetExecutedCurrently(false);
+        return;
+    }
 
     SendCastResult(castResult);
@@ -2310 +2319 @@
         handle_immediate();
     }
+    
+    SetExecutedCurrently(false);
 }
 
@@ -5127 +5138 @@
         m_Spell->cancel();
 }
+
+bool SpellEvent::IsDeletable() const
+{
+    return m_Spell->IsDeletable();
+}