Added show_turns option to control turn counter display.

Also documented morgue_dir (thanks, David).

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

6 files changed, 31 insertions, 5 deletions

diff --git a/crawl-ref/docs/crawl_options.txt b/crawl-ref/docs/crawl_options.txt
index 7045a31296..97734af1fd 100644
--- a/crawl-ref/docs/crawl_options.txt
+++ b/crawl-ref/docs/crawl_options.txt
@@ -11,7 +11,7 @@ The contents of this text are:
 		chaos_knight, death_knight, priest, 
 		race, class, random_pick
 2-  File System and Sound.
-                crawl_dir, save_dir, sound
+                crawl_dir, morgue_dir, save_dir, sound
 3-  Lua files.
 		lua_file,
 		base.lua, stash.lua, wield.lua, kills.lua, runrest.lua, 
@@ -48,7 +48,8 @@ The contents of this text are:
                 easy_exit_menu,	default_autoprayer, sort_menus
 4-i	Message and Display Improvements.
 		hp_warning, hp_colour, mp_colour, always_greet, terse_hand, 
-                delay_message_clear, menu_colour, increasing_skill_progress
+                delay_message_clear, menu_colour, increasing_skill_progress,
+                show_turns
 4-j	Missiles.
 		fire_items_start, fire_order
 4-k	Message Channels.
@@ -154,6 +155,10 @@ crawl_dir= <path>
 	Directory for reading macro.txt and init.txt, and dumping characters.
 	It should end with the path delimiter.
 
+morgue_dir = <path>
+        Directory where morgue dumps (morgue*.txt and morgue*.lst) files are
+        written.
+
 save_dir = <path>
         Directory where saves and bones are stored. This option may be ignored
         depending on the settings used to compile Crawl, but should be
@@ -567,7 +572,7 @@ end
 4-g	Stashes.
 ----------------
 
-stash_tracking = (explicit | dropped | all)
+stash_tracking = (all | explicit | dropped)
         A stash is a heap of items tracked by Crawl. You can search in your
         stashes with Ctrl-F. This options rules how stashes are generated.
         When stash_tracking is set to 'all' (the default), the game marks any 
@@ -714,6 +719,9 @@ increasing_skill_progress = true
         read (0%). With false, you get the old behaviour which counts backwards
         from 10.
 
+show_turns = true
+        This option controls whether the turn counter (of turns elapsed) is
+        displayed in the main view.
 
 4-j	Missiles.
 -----------------
diff --git a/crawl-ref/init.txt b/crawl-ref/init.txt
index 5416042806..868715cff7 100644
--- a/crawl-ref/init.txt
+++ b/crawl-ref/init.txt
@@ -46,6 +46,7 @@
 ##### 2-  File System ###############################################
 #
 # crawl_dir= <path>
+# morgue_dir = morgues
 # save_dir = saves
 # sound = <regex>:<path to sound file>
 
@@ -157,6 +158,7 @@ stab_brand = hi:blue
 # delay_message_clear = true
 # always_greet = false
 # increasing_skill_progress = false
+# show_turns = false
 #
 menu_colour = lightred: cursed.*(worn|neck|hand|weapon)\)
 menu_colour = green:(worn|neck|hand|weapon)\)
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index bd467f20e2..61e07b0787 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -796,6 +796,8 @@ public:
     bool        autoprayer_on;
     bool        fizzlecheck_on;
 
+    bool        show_turns;     // Show turns used in HUD.
+
     long        autopickups;    // items to autopickup
     bool        verbose_dump;   // make character dumps contain more detail
     bool        detailed_stat_dump; // add detailed stat and resist dump
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 9fb464ce70..0b3c032e6d 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -534,6 +534,8 @@ void game_options::reset_options()
     autoprayer_on = false;
     fizzlecheck_on = false;
 
+    show_turns = true;
+
     prev_race = 0;
     prev_cls  = 0;
     prev_ck   = GOD_NO_GOD;
@@ -1617,6 +1619,10 @@ void game_options::read_option_line(const std::string &str, bool runscript)
         save_dir = field;
 #endif
     }
+    else if (key == "show_turns")
+    {
+        show_turns = read_bool( field, show_turns );
+    }
     else if (key == "morgue_dir")
     {
         if (morgue_dir.empty())
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 4ab715cfa4..2c544fb544 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -62,8 +62,12 @@ void update_turn_count()
 {
     // Don't update turn counter when running/resting/traveling to
     // prevent pointless screen updates.
-    if (you.running > 0 || (you.running < 0 && Options.travel_delay == -1))
+    if (!Options.show_turns
+        || you.running > 0
+        || (you.running < 0 && Options.travel_delay == -1))
+    {
         return;
+    }
 
     // FIXME: Create some kind of layout manager class so we can
     // templatise the heads-up display layout and stop hardcoding
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 8010d78673..8d046bb608 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -1666,7 +1666,11 @@ void draw_border(void)
     gotoxy(40,  8); cprintf("Int:");
     gotoxy(40,  9); cprintf("Dex:");
     gotoxy(40, 10); cprintf("Gold:");
-    gotoxy(55, 10); cprintf("Turn:");
+    if (Options.show_turns)
+    {
+        gotoxy(55, 10);
+        cprintf("Turn:");
+    }
     gotoxy(40, 11); cprintf("Experience:");
     gotoxy(40, 12); cprintf("Level");
 }                               // end draw_border()