- Timestamp:
- 11/22/08 00:35:49 (17 years ago)
- Location:
- trunk/src/game
- Files:
-
- 5 modified
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/game/SharedDefines.h
r272 r274 2070 2070 SUMMON_TYPE_CRITTER3 = 307, 2071 2071 SUMMON_TYPE_UNKNOWN5 = 409, 2072 SUMMON_TYPE_ UNKNOWN2= 427,2072 SUMMON_TYPE_POSESSED3 = 427, 2073 2073 SUMMON_TYPE_POSESSED2 = 428 2074 2074 }; -
trunk/src/game/Spell.cpp
r273 r274 3864 3864 case SUMMON_TYPE_POSESSED: 3865 3865 case SUMMON_TYPE_POSESSED2: 3866 case SUMMON_TYPE_POSESSED3: 3866 3867 case SUMMON_TYPE_DEMON: 3867 3868 case SUMMON_TYPE_SUMMON: -
trunk/src/game/SpellAuras.cpp
r272 r274 50 50 #include "GridNotifiersImpl.h" 51 51 #include "CellImpl.h" 52 #include "TemporarySummon.h"53 52 54 53 #define NULL_AURA_SLOT 0xFF … … 2015 2014 return; 2016 2015 } 2017 2018 // Eye of Kilrogg, unsummon eye when aura is gone2019 if(GetId() == 126 && caster->GetTypeId() == TYPEID_PLAYER && caster->GetCharm())2020 {2021 ((TemporarySummon*)caster->GetCharm())->UnSummon();2022 return;2023 }2024 2016 } 2025 2017 -
trunk/src/game/SpellEffects.cpp
r272 r274 3137 3137 case SUMMON_TYPE_POSESSED: 3138 3138 case SUMMON_TYPE_POSESSED2: 3139 case SUMMON_TYPE_POSESSED3: 3139 3140 EffectSummonPossessed(i); 3140 3141 break; … … 3161 3162 break; 3162 3163 case SUMMON_TYPE_UNKNOWN1: 3163 case SUMMON_TYPE_UNKNOWN2:3164 3164 case SUMMON_TYPE_UNKNOWN3: 3165 3165 case SUMMON_TYPE_UNKNOWN4: -
trunk/src/game/SpellHandler.cpp
r272 r274 34 34 #include "ScriptCalls.h" 35 35 #include "Totem.h" 36 #include "TemporarySummon.h" 36 37 37 38 void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket) … … 371 372 return; 372 373 } 374 else if (spellInfo->Effect[i] == SPELL_EFFECT_SUMMON && 375 (spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED || 376 spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED2 || 377 spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED3)) 378 { 379 // Possession is removed in the UnSummon function 380 ((TemporarySummon*)caster->GetCharm())->UnSummon(); 381 } 373 382 } 374 383 }