Changeset 284 for trunk/src/game/SpellHandler.cpp

Timestamp:

11/22/08 01:55:20 (17 years ago)

Author:

yumileroy

Message:

Merge with 284 (54b0e67d97fe).

Original author: megamage
Date: 2008-11-21 19:49:54-06:00

Files:

• trunk/src/game/SpellHandler.cpp (modified) (2 diffs)

trunk/src/game/SpellHandler.cpp

@@ -34 +34 @@
 #include "ScriptCalls.h"
 #include "Totem.h"
+#include "TemporarySummon.h"
 
 void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket)
@@ -377 +378 @@
                 return;
             }
+            else if (spellInfo->Effect[i] == SPELL_EFFECT_SUMMON && 
+                (spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED || 
+                 spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED2 || 
+                 spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED3))
+            {
+                // Possession is removed in the UnSummon function
+                ((TemporarySummon*)_player->GetCharm())->UnSummon();
+            }
         }
     }