Lots of things which used to be members (invis, conf, confusing_touch, etc.)

are now durations.
Removed some unnecessary limitations.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1626 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 4 insertions, 4 deletions

diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc
index 6a3fccf2f3..aef2799ce4 100644
--- a/crawl-ref/source/spells4.cc
+++ b/crawl-ref/source/spells4.cc
@@ -1169,7 +1169,7 @@ void cast_ignite_poison(int pow)
     }
 
     // player is poisoned
-    damage += roll_dice( you.poisoning, 6 );
+    damage += roll_dice( you.duration[DUR_POISONING], 6 );
 
     if (damage)
     {
@@ -1192,10 +1192,10 @@ void cast_ignite_poison(int pow)
 
         ouch( damage, 0, KILLED_BY_TARGETTING );
 
-        if (you.poisoning > 0)
+        if (you.duration[DUR_POISONING] > 0)
         {
             mpr( "You feel that the poison has left your system." );
-            you.poisoning = 0;
+            you.duration[DUR_POISONING] = 0;
         }
     }
 
@@ -2982,7 +2982,7 @@ void cast_sandblast(int pow, bolt &beam)
 
 void cast_condensation_shield(int pow)
 {
-    if (you.equip[EQ_SHIELD] != -1 || you.fire_shield)
+    if (you.equip[EQ_SHIELD] != -1 || you.duration[DUR_FIRE_SHIELD])
         canned_msg(MSG_SPELL_FIZZLES);
     else
     {