Fixed bad play time format in character dump, removed turns_by_place and kills_by_place from the default dump_order.

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

3 files changed, 17 insertions, 11 deletions

diff --git a/crawl-ref/docs/crawl_options.txt b/crawl-ref/docs/crawl_options.txt
index fb40f02c99..ac092d28d0 100644
--- a/crawl-ref/docs/crawl_options.txt
+++ b/crawl-ref/docs/crawl_options.txt
@@ -332,7 +332,7 @@ pickup_thrown = true
         you're fighting, or use safe_autopickup=true.
 
 pickup_dropped = false
-        Pickup_dropped lets autopickup affect objects you've dropped. Set to 
+        pickup_dropped lets autopickup affect objects you've dropped. Set to 
         false to block autopickup for dropped objects. This can be convenient.
 
 assign_item_slot = (forward | backward)
@@ -1027,9 +1027,9 @@ show_turns = false
 
 show_beam = false
         When performing actions such as throwing or zapping, you can toggle 
-	whether to show the beam path or not. This option controls the 
-	initial status of this toggle. When set to true, the path will be 
-	shown.
+        whether to show the beam path or not. This option controls the 
+	    initial status of this toggle. When set to true, the path will be 
+    	shown.
 
 item_stack_summary_minimum = 5
         If you step over a stack with this number or more of items in it,
@@ -1216,12 +1216,18 @@ dump_item_origin_price = 100
 dump_message_count = 7
         The number of last messages to be displayed in character dump files. 
 
-dump_order  = header,hiscore,stats,misc,notes,inventory,turns_by_place,
+dump_order  = header,hiscore,stats,misc,notes,inventory,
 dump_order += skills,spells,overview,mutations,messages,screenshot
-dump_order += kills_by_place,,kills
+dump_order += kills
         Controls the order of sections in the dump. You can use multiple
         dump_order lines - all lines but the first must use dump_order +=
 
+        Two optional dump sections are turns_by_place and kills_by_place,
+        which add detailed statistics to where turns were spent and monsters
+        were killed. You can add them to your dump as:
+
+             dump_order += turns_by_place, kills_by_place
+        
 
 5-b     Notes.
 --------------
@@ -1463,8 +1469,8 @@ mon_glyph = <monster name or symbol> : <colour> <glyph>
         (The left hand side of the : is case-sensitive.)
         
         You can specify symbols using their code points using the
-        syntax as shown in feature. If you're using char_set=unicode,
-        you can use unicode code points:
+        syntax as shown in the "feature" option. If you're using
+        char_set=unicode, you can use unicode code points:
         
         mon_glyph = draconian scorcher : x6e9
 
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 43cf178837..c887384b2d 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -755,9 +755,9 @@ void game_options::reset_options()
     extra_levels.clear();
     
     dump_order.clear();
-    new_dump_fields("header,hiscore,stats,misc,turns_by_place,inventory,"
+    new_dump_fields("header,hiscore,stats,misc,inventory,"
                     "skills,spells,overview,mutations,messages,screenshot,"
-                    "kills_by_place,kills,notes");
+                    "kills,notes");
 
     hp_colour.clear();
     hp_colour.push_back(std::pair<int,int>(100, LIGHTGREY));
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 32c2572f9d..c82506c82b 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -820,7 +820,7 @@ std::vector<formatted_string> get_full_detail(bool calc_unid, long sc)
         snprintf(buf, sizeof buf,
                  "Play time  : %10s\n"
                  "Turns      : %10ld\n",
-                 make_time_string(curr).c_str(), you.num_turns );
+                 make_time_string(curr, true).c_str(), you.num_turns );
         cols.add_formatted(0, buf, true);
     }