Show
Ignore:
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:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/src/game/SpellAuras.cpp

    r283 r284  
    5050#include "GridNotifiersImpl.h" 
    5151#include "CellImpl.h" 
    52 #include "TemporarySummon.h" 
    5352 
    5453#define NULL_AURA_SLOT 0xFF 
     
    20252024            return; 
    20262025        } 
    2027  
    2028         // Eye of Kilrogg, unsummon eye when aura is gone 
    2029         if(GetId() == 126 && caster->GetTypeId() == TYPEID_PLAYER && caster->GetCharm()) 
    2030         { 
    2031             ((TemporarySummon*)caster->GetCharm())->UnSummon(); 
    2032             return; 
    2033         } 
    20342026    } 
    20352027