Remove some of my infamous debugging statements (I keep forgetting

them!) and move the new pdf files around, renaming contact.pdf to
README.pdf since it's the shorter version of readme.txt, also
capitalized now.


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

6 files changed, 12 insertions, 13 deletions

diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc
index f3cb294950..aaf7cce8a4 100644
--- a/crawl-ref/source/debug.cc
+++ b/crawl-ref/source/debug.cc
@@ -1935,11 +1935,11 @@ void debug_item_scan( void )
             _dump_item( name, i, mitm[i] );
         }
         else if ((mitm[i].base_type == OBJ_WEAPONS
-                 && (abs(mitm[i].plus) > 30
-                    || abs(mitm[i].plus2) > 30
-                    || !is_random_artefact( mitm[i] )
-                       && mitm[i].special >= 30
-                       && mitm[i].special < 181))
+                    && (abs(mitm[i].plus) > 30
+                        || abs(mitm[i].plus2) > 30
+                        || !is_random_artefact( mitm[i] )
+                           && mitm[i].special >= 30
+                           && mitm[i].special < 181))
 
                  || (mitm[i].base_type == OBJ_MISSILES
                      && (abs(mitm[i].plus) > 25
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 0729331445..54150223eb 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -1066,8 +1066,6 @@ void direction(dist& moves, targeting_type restricts,
             else if (moves.isValid || moves.isCancel
                      || yesno("Are you sure you want to fizzle?", false, 'n'))
             {
-                mpr("We're done.", MSGCH_DIAGNOSTICS);
-
                 // Finalize whatever is inside the loop
                 // (moves-internal finalizations can be done later).
                 moves.choseRay = show_beam;
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 1a1c2b93a3..2327307d4f 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -2660,7 +2660,7 @@ bool is_shield_incompatible(const item_def &weapon, const item_def *shield)
 
 std::string item_base_name(const item_def &item)
 {
-    switch ( item.base_type )
+    switch (item.base_type)
     {
     case OBJ_WEAPONS:
         return Weapon_prop[Weapon_index[item.sub_type]].name;
diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc
index 63a85194a6..8d35c5f481 100644
--- a/crawl-ref/source/randart.cc
+++ b/crawl-ref/source/randart.cc
@@ -1309,11 +1309,13 @@ std::string randart_name(const item_def &item, bool appearance)
     std::string lookup;
     std::string result;
 
-    // use prefix of gifting god, if applicable
+    // Use prefix of gifting god, if applicable.
     bool god_gift = false;
     int item_orig = 0;
-    if (!appearance) // god prefix not necessary for appearance
+    if (!appearance)
     {
+        // Divine gifts don't look special, so this is only necessary
+        // for actually naming an item.
         item_orig = item.orig_monnum;
         if (item_orig < 0)
             item_orig = -item_orig - 2;
@@ -1351,7 +1353,7 @@ std::string randart_name(const item_def &item, bool appearance)
         result += appear;
         result += " ";
         result += item_base_name(item);
-        return result;
+        return (result);
     }
 
     if (_pick_db_name(item))
diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc
index 675af72233..6edc0d33a8 100644
--- a/crawl-ref/source/spl-util.cc
+++ b/crawl-ref/source/spl-util.cc
@@ -792,7 +792,6 @@ bool spell_direction( dist &spelld, bolt &pbolt,
 
     if (!spelld.isValid)
     {
-        mpr("Not valid after all?", MSGCH_DIAGNOSTICS);
         // Check for user cancel.
         canned_msg(MSG_OK);
         return (false);
diff --git a/crawl-ref/source/util/docs/contact.tex b/crawl-ref/source/util/docs/README.tex
index 9b158810c4..71e73430ea 100644
--- a/crawl-ref/source/util/docs/contact.tex
+++ b/crawl-ref/source/util/docs/README.tex
@@ -140,7 +140,7 @@ guide on how to set this up.
 \para
 
 \crawl\ features an alternative to the classical ASCII display; Tile-based
-Crawl is often easier accessible by new players. Tiles are available for 
+Crawl is often a lot more accessible by new players. Tiles are available for 
 Linux, Windows and OS X.
 Unfortunately, it is not yet possible to combine tiles and internet play.
 \end{document}