diff options
| author | n0n4m3 <none@none> | 2009-12-17 11:06:50 +0100 |
|---|---|---|
| committer | n0n4m3 <none@none> | 2009-12-17 11:06:50 +0100 |
| commit | 40255a660b3f3a16f5f5884ad0e04b8cec8ce25e (patch) | |
| tree | 6ed77083d13bbd0bef3858d575e1cfeba3c77fca /src/game/CreatureEventAI.cpp | |
| parent | a7c0f6beb3635a28f8200828a8a1f96c1a17967a (diff) | |
Some fixes for GameObject, Chat, Creature, update DuelHandler for 322a
--HG--
branch : trunk
Diffstat (limited to 'src/game/CreatureEventAI.cpp')
| -rw-r--r-- | src/game/CreatureEventAI.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/game/CreatureEventAI.cpp b/src/game/CreatureEventAI.cpp index f50f7e4128b..07de3fa0efc 100644 --- a/src/game/CreatureEventAI.cpp +++ b/src/game/CreatureEventAI.cpp @@ -71,10 +71,9 @@ CreatureEventAI::CreatureEventAI(Creature *c ) : CreatureAI(c) if ((*i).event_flags & EFLAG_DEBUG_ONLY) continue; #endif - if(((*i).event_flags & (EFLAG_HEROIC | EFLAG_NORMAL)) && m_creature->GetMap()->IsDungeon() ) + if(m_creature->GetMap()->IsDungeon()) { - if( (m_creature->GetMap()->IsHeroic() && (*i).event_flags & EFLAG_HEROIC) || - (!m_creature->GetMap()->IsHeroic() && (*i).event_flags & EFLAG_NORMAL)) + if ((1 << (m_creature->GetMap()->GetSpawnMode()+1)) & (*i).event_flags) { //event flagged for instance mode CreatureEventAIList.push_back(CreatureEventAIHolder(*i)); |