Permalink
Browse files

check saving throws also for effects that ignore magic resistance

fixes level 12 chromatic orb instakill behaviour yet again
  • Loading branch information...
1 parent f5082c0 commit cc4769c40c3e0488aed8d88706de719d241252a5 @lynxlynxlynx lynxlynxlynx committed Jun 20, 2014
Showing with 6 additions and 8 deletions.
  1. +6 −8 gemrb/core/EffectQueue.cpp
View
@@ -1072,14 +1072,12 @@ static bool check_resistance(Actor* actor, Effect* fx)
}
*/
- //not resistable (no saves either?)
- if(fx->Resistance != FX_CAN_RESIST_CAN_DISPEL) {
- return false;
- }
-
- int magic = check_magic_res(actor, fx, caster);
- if (magic < 2) {
- return magic;
+ //not resistable (but check saves - for chromatic orb instakill)
+ if (fx->Resistance == FX_CAN_RESIST_CAN_DISPEL) {
+ int magic = check_magic_res(actor, fx, caster);
+ if (magic < 2) {
+ return magic;
+ }
}
if (pstflags && (actor->GetSafeStat(IE_STATE_ID) & (STATE_ANTIMAGIC) ) ) {

0 comments on commit cc4769c

Please sign in to comment.