Put "background" back into crawl_options.txt.

Made use_notes=true the default (David).

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

2 files changed, 13 insertions, 2 deletions

diff --git a/crawl-ref/docs/crawl_options.txt b/crawl-ref/docs/crawl_options.txt
index fcc65f8a95..0f4bfcd486 100644
--- a/crawl-ref/docs/crawl_options.txt
+++ b/crawl-ref/docs/crawl_options.txt
@@ -67,9 +67,11 @@ The contents of this text are:
 		note_messages, note_all_spells

 6-  Miscellaneous.

 6-a	All OS.

-		macro_meta_entry, wiz_mode, colours, char_set, background

+		macro_meta_entry, wiz_mode, colours, char_set

 6-b	DOS and Windows.

 		dos_use_background_intensity

+6-c     Unix

+                background

 

 --------------------------------------------------------------------------------

 

@@ -952,3 +954,12 @@ dos_use_background_intensity = false
         friend-branding. If your console doesn't like this option, some friendly

         monsters will appear as blinking characters (and setting this option to

         false may be advisable to preserve your sanity in such cases).

+

+6-c     Unix

+------------

+

+background = <colour>

+        Sets the default background colour by name (defaults to BLACK). This

+        may be useful if you're using a terminal with a background colour other

+        than black (such as an xterm), but this option is still experimental

+        and the results may not be very good.

diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index a0c06eeac6..d5ef24f202 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -517,7 +517,7 @@ void reset_options(bool clear_name)
     Options.hp_attention           = 25;
     Options.confirm_self_target    = false;
     Options.safe_autopickup        = false;
-    Options.use_notes              = false;
+    Options.use_notes              = true;
     Options.note_skill_max         = false;
     Options.note_all_spells        = false;
     Options.note_hp_percent        = 0;