[crawl-ref-commits] master branch updated: 0.11-a0-269-ge80537d

[<gi...@cr...>]

       via  e80537dcc93b76a30a1677d83a486520be90863f (commit)
       via  95ed5467b07232a32858153cf2b666a9b623629e (commit)
      from  c50d1646e60849364862756fcea7fe823eeae4cf (commit)

-----------------------------------------------------------------------
commit e80537dcc93b76a30a1677d83a486520be90863f
Author: David Lawrence Ramsey <dol...@us...>
Date:   Sun Feb 26 14:47:17 2012 -0600

    Add formatting fixes.

commit 95ed5467b07232a32858153cf2b666a9b623629e
Author: David Lawrence Ramsey <dol...@us...>
Date:   Sun Feb 26 14:44:57 2012 -0600

    Fix the status checks for Xom's potion of curing effects.
    
    This duplicates logic in potion_effect(), but it's at least accurate now.

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/xom.cc |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 574308c..8b2b178 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -1146,10 +1146,10 @@ static int _xom_do_potion(bool debug = false)
     potion_type pot = POT_CURING;
     while (true)
     {
-        pot = random_choose(POT_CURING, POT_HEAL_WOUNDS, POT_MAGIC,
-                              POT_SPEED, POT_MIGHT, POT_AGILITY, POT_BRILLIANCE,
-                              POT_INVISIBILITY, POT_BERSERK_RAGE,
-                            POT_EXPERIENCE, -1);
+        pot = random_choose(POT_CURING, POT_HEAL_WOUNDS, POT_MAGIC, POT_SPEED,
+                            POT_MIGHT, POT_AGILITY, POT_BRILLIANCE,
+                            POT_INVISIBILITY, POT_BERSERK_RAGE, POT_EXPERIENCE,
+                            -1);
 
         if (pot == POT_EXPERIENCE && !one_chance_in(6))
             pot = POT_BERSERK_RAGE;
@@ -1160,8 +1160,9 @@ static int _xom_do_potion(bool debug = false)
         switch (pot)
         {
         case POT_CURING:
-            if (you.rotting || you.disease || you.duration[DUR_CONF]
-                || you.duration[DUR_POISONING])
+            if (you.duration[DUR_POISONING] || you.rotting || you.disease
+                || you.duration[DUR_CONF] || you.duration[DUR_MISLED]
+                || you.duration[DUR_NAUSEA])
             {
                 break;
             }


-- 
Dungeon Crawl Stone Soup