Trunk->0.3 merge: typos + permanent mutation fixes.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2508 c06c8d41-db1a-0410-9941-cceddc491573

4 files changed, 14 insertions, 11 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 7c1e80a87d..12234d874e 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -2001,10 +2001,9 @@ static void decrement_durations()
     }
 
     // Vampire bat transformations are permanent (until ended.)
-    if ((you.species != SP_VAMPIRE ||
-         you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT
-         || you.duration[DUR_TRANSFORMATION] <= 2)
-         && you.duration[DUR_TRANSFORMATION] < 100 )
+    if (you.species != SP_VAMPIRE
+        || you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT
+        || you.duration[DUR_TRANSFORMATION] <= 2)
     {
         if ( decrement_a_duration(DUR_TRANSFORMATION,
                                   NULL, 10, random2(3),
diff --git a/crawl-ref/source/dat/speak.txt b/crawl-ref/source/dat/speak.txt
index 897e868b22..046dd62767 100644
--- a/crawl-ref/source/dat/speak.txt
+++ b/crawl-ref/source/dat/speak.txt
@@ -1522,7 +1522,7 @@ VISUAL:@The_monster@ tries to bite you.
 
 @The_monster@ says, "You will soon forget everything."
 
-@The_monster@ says, "Look into my eyes.
+@The_monster@ says, "Look into my eyes."
 
 @The_monster@ says, "I'm your fate."
 
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 639cfa9021..9d315804e0 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -652,7 +652,7 @@ static void damnation_card(int power, deck_rarity_type rarity)
 
         if ( mon_to_banish == NON_MONSTER ) // banish yourself!
         {
-            banished(DNGN_ENTER_ABYSS);
+            banished(DNGN_ENTER_ABYSS, "drawing a card");
             break;              // don't banish anything else
         }
         else
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index dc83cf5c2e..ec81db920a 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -767,11 +767,15 @@ static bool xom_is_bad(int sever)
             temp_rand = random2(3);
                 
             god_speaks(GOD_XOM,
-                       (temp_rand == 0) ? "\"You have grown too comfortable in your little world, mortal!\"" :
-                       (temp_rand == 1) ? "Xom casts you into the Abyss!"
-                       : "The world seems to spin as Xom's maniacal laughter rings in your ears.");
-                
-            banished(DNGN_ENTER_ABYSS);
+                       (temp_rand == 0) ?
+                       "\"You have grown too comfortable in your little world, "
+                       "mortal!\"" :
+                       (temp_rand == 1) ?
+                       "Xom casts you into the Abyss!"
+                       : "The world seems to spin as Xom's "
+                         "maniacal laughter rings in your ears.");
+                
+            banished(DNGN_ENTER_ABYSS, "Xom");
                 
             done = true;
         }