Commit a few changes, mostly clean-up.

* Modify tile_show_items setting in tutorial to (hopefully) show corpses
  again.
* Change skill_exp_needed to use the level input rather than decreasing
  the passed in parameter, esp. when it was mostly called in the form
  skill_exp_needed(x + 1) anyway.
  I was trying to find out what went wrong in BR 1929156 but I can't
  work out the formula. :(


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

1 files changed, 18 insertions, 23 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index ff9d1c5a8b..53ed6dcd91 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -418,41 +418,36 @@ god_conduct_trigger::~god_conduct_trigger()
 
 bool is_evil_god(god_type god)
 {
-    return
-        god == GOD_KIKUBAAQUDGHA ||
-        god == GOD_MAKHLEB ||
-        god == GOD_YREDELEMNUL ||
-        god == GOD_BEOGH ||
-        god == GOD_LUGONU;
+    return (god == GOD_KIKUBAAQUDGHA
+            || god == GOD_MAKHLEB
+            || god == GOD_YREDELEMNUL
+            || god == GOD_BEOGH
+            || god == GOD_LUGONU);
 }
 
 bool is_good_god(god_type god)
 {
-    return
-        god == GOD_ZIN ||
-        god == GOD_SHINING_ONE ||
-        god == GOD_ELYVILON;
+    return (god == GOD_ZIN
+            || god == GOD_SHINING_ONE
+            || god == GOD_ELYVILON);
 }
 
 bool is_chaotic_god(god_type god)
 {
-    return
-        god == GOD_XOM ||
-        god == GOD_MAKHLEB;
+    return (god == GOD_XOM
+            || god == GOD_MAKHLEB);
 }
 
 bool is_lawful_god(god_type god)
 {
-    return
-        god == GOD_ZIN;
+    return (god == GOD_ZIN);
 }
 
 bool is_priest_god(god_type god)
 {
-    return
-        god == GOD_ZIN ||
-        god == GOD_YREDELEMNUL ||
-        god == GOD_BEOGH;
+    return (god == GOD_ZIN
+            || god == GOD_YREDELEMNUL
+            || god == GOD_BEOGH);
 }
 
 void dec_penance(god_type god, int val)
@@ -468,14 +463,14 @@ void dec_penance(god_type god, int val)
             take_note(Note(NOTE_MOLLIFY_GOD, god));
             you.penance[god] = 0;
 
-            // TSO's halo is once more available
+            // TSO's halo is once more available.
             if (god == GOD_SHINING_ONE && you.religion == GOD_SHINING_ONE
                 && you.piety >= piety_breakpoint(0))
             {
                 mpr("Your divine halo returns!");
             }
 
-            // orcish bonuses are now once more effective
+            // Orcish bonuses are now once more effective.
             if (god == GOD_BEOGH && you.religion == GOD_BEOGH)
                  you.redraw_armour_class = true;
 
@@ -487,12 +482,12 @@ void dec_penance(god_type god, int val)
         else
             you.penance[god] -= val;
     }
-}                               // end dec_penance()
+}
 
 void dec_penance(int val)
 {
     dec_penance(you.religion, val);
-}                               // end dec_penance()
+}
 
 bool beogh_water_walk()
 {