From c5b6cd12c17f67554a12286752f3a138c0b3c3bc Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Sun, 2 Dec 2007 14:22:27 +0000
Subject: Trunk->0.3 merge (2975): Fixed Xom mutation counts, updated changes
 for 0.3.3.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2976 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/docs/changes.stone_soup | 18 ++++++++++++++++++
 crawl-ref/source/xom.cc           |  7 ++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup
index 48fd5daf42..bdd21b07b6 100644
--- a/crawl-ref/docs/changes.stone_soup
+++ b/crawl-ref/docs/changes.stone_soup
@@ -1,3 +1,21 @@
+Stone Soup 0.3.3 (20071202)
+---------------------------
+* Fixed crash when draconian callers try to summon drakes.
+* Fixed crash when shadow creatures is cast in a labyrinth.
+* Fixed crash when monster blinks onto trap and is killed by the trap.
+* Fixed vampires boosting the player's maxhp.
+* Fixed bad monster selection when shadow creatures is cast post-orb-pickup.
+* Fixed buggy Xom mutations.
+* Fixed nets not trapping monsters correctly.
+* Fixed monsters being able to get past plants on level load.
+* Fixed out-of-sight monsters raising dead in the player's line-of-sight.
+* Returning weapons auto-id on use by monsters.
+* Autobutcher respects !w inscriptions.
+* Horns mutation changes helmet slot description to "restricted".
+* Reintroduced Beogh penance for destroying orcish idols.
+* Tutorial fixes.
+* Errors in .crawlrc are reported at startup.
+
 Stone Soup 0.3.2 (20071110)
 ---------------------------
 * Fixed tiles crash when visiting shops in the stash-tracker's ^F listings.
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index ad494e7dae..7a58cd7649 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -538,15 +538,12 @@ static bool xom_is_good(int sever)
         deflate_hp(you.hp_max / 2, true);
                 
         bool failMsg = true;
-        int i = 0;
-        int j = random2(4);
-        while (i < j)
+        for (int i = random2(4); i >= 0; --i)
         {
             if (mutate(RANDOM_GOOD_MUTATION, failMsg, true))
                 done = true;
             else
                 failMsg = false;
-            i++;
         }
     }
     else if (random2(sever) <= 9)
@@ -680,7 +677,7 @@ static bool xom_is_bad(int sever)
             deflate_hp(you.hp_max / 2, true);
                 
             bool failMsg = true;
-            for (int i = 0; i < random2(4)+1; i++)
+            for (int i = random2(4); i >= 0; --i)
             {
                 if (mutate(RANDOM_XOM_MUTATION, failMsg, true))
                     done = true;
-- 
cgit v1.2.3-54-g00ecf