Trunk->0.3 merge (2701-2703): s/favorite/favourite/, god penance message sequence, update stashes after butchering corpse.

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

3 files changed, 12 insertions, 15 deletions

diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 1dbac68d68..c72a15f30b 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -37,6 +37,7 @@
 #include "randart.h"
 #include "religion.h"
 #include "spl-util.h"
+#include "stash.h"
 #include "stuff.h"
 #include "travel.h"
 #include "tutorial.h"
@@ -498,8 +499,8 @@ static void finish_delay(const delay_queue_item &delay)
 
         unwear_armour( delay.parm1 );
 
-        you.redraw_armour_class = 1;
-        you.redraw_evasion = 1;
+        you.redraw_armour_class = true;
+        you.redraw_evasion = true;
         break;
     }
     case DELAY_EAT:
@@ -594,6 +595,7 @@ static void finish_delay(const delay_queue_item &delay)
         {
             mpr("You stop butchering the corpse.");
         }
+        stashes.update_stash(); // Stash-track the generated item(s)
         break;
     }
 
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index beb12e7f6b..eb6a9f9603 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -379,9 +379,7 @@ void dec_penance(god_type god, int val)
 
             // bonuses now once more effective
             if ( god == GOD_BEOGH && you.religion == GOD_BEOGH)
-            {
-                 you.redraw_armour_class = 1;
-            }
+                 you.redraw_armour_class = true;
         }
         else
             you.penance[god] -= val;
@@ -2408,16 +2406,9 @@ void divine_retribution( god_type god )
     if (god == you.religion && is_good_god(god) )
         return;
 
-    // Just the thought of retribution (getting this far) mollifies
-    // the god by at least a point... the punishment might reduce
-    // penance further.
-    dec_penance( god, 1 + random2(3) );
-
-    bool do_more = true;
-    
+    bool do_more = true;   
     switch (god)
     {
-
     // One in ten chance that Xom might do something good...
     case GOD_XOM: xom_acts(one_chance_in(10), abs(you.piety - 100)); break;
     case GOD_SHINING_ONE:   do_more = tso_retribution(); break;
@@ -2458,6 +2449,10 @@ void divine_retribution( god_type god )
             }
         }
     }
+
+    // Just the thought of retribution mollifies the god by at least a
+    // point...the punishment might have reduced penance further.
+    dec_penance( god, 1 + random2(3) );
 }
 
 // upon excommunication, (now ex) Beogh adepts lose their orcish followers
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index c318c7d2e5..f35711419e 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -93,14 +93,14 @@ static const char *xom_generic_beneficence[] =
 const char *describe_xom_favour()
 {
     return (you.piety > 160) ? "A beloved toy of Xom." : 
-        (you.piety > 145) ? "A favorite toy of Xom." : 
+        (you.piety > 145) ? "A favourite toy of Xom." : 
         (you.piety > 130) ? "A very special toy of Xom." : 
         (you.piety > 115) ? "A special toy of Xom." : 
         (you.piety > 100) ? "A toy of Xom." : 
         (you.piety >  85) ? "A plaything of Xom." : 
         (you.piety >  70) ? "A special plaything of Xom." : 
         (you.piety >  55) ? "A very special plaything of Xom." : 
-        (you.piety >  40) ? "A favorite plaything of Xom." : 
+        (you.piety >  40) ? "A favourite plaything of Xom." : 
                             "A beloved plaything of Xom.";
 }