Remove "lightgrey" from the default hp_colour and mp_colour options

("lightgrey, 50:yellow, 25:red"), so output.cc can choose the default
colour.



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

3 files changed, 10 insertions, 11 deletions

diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index a14c27233d..d5e940a222 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -1019,17 +1019,18 @@ mp_warning = 0
         channel when the player's magic points drop below this 
         percentage of their maximum (use 0 to turn off these messages).
 
-hp_colour = lightgrey, 50:yellow, 25:red
-        hp_colour colours your HP appropriately in the display. In the 
-        default setting, your HP will appear in red if at less then 25%, 
-        yellow if at less than 50%, and lightgrey otherwise.
+hp_colour = 50:yellow, 25:red
+        hp_colour colours your Health appropriately in the status
+        display. In the default setting, your health will appear in
+        red if at less than 25%, yellow if at less than 50%, and in
+        the default colour otherwise.
 
-mp_colour = lightgrey, 50:yellow, 25:red
-        mp_colour does to MP what hp_colour does to HP.
+mp_colour = 50:yellow, 25:red
+        mp_colour does to Magic what hp_colour does to Health.
 
 status_caption_colour = brown
         Sets the colour that is used to display the captions in the status
-        area (for instance the "HP:" in HP: 10/10).
+        area (for instance the "Health:" in "Health: 10/10").
 
 delay_message_clear = false
         Setting this option to true will delay the clearing of messages 
diff --git a/crawl-ref/init.txt b/crawl-ref/init.txt
index 6f07911cd7..4fcaab25a9 100644
--- a/crawl-ref/init.txt
+++ b/crawl-ref/init.txt
@@ -204,8 +204,8 @@ trapwalk_safe_hp = dart:20,needle:15,arrow:35,bolt:45,spear:40,axe:45,blade:95
 # hp_warning = 10
 # mp_warning = 0
 
-# hp_colour = lightgrey, 50:yellow, 25:red
-# mp_colour = lightgrey, 50:yellow, 25:red
+# hp_colour = 50:yellow, 25:red
+# mp_colour = 50:yellow, 25:red
 # status_caption_colour = yellow
 # delay_message_clear    = true
 # show_inventory_weights = true
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 03cffd47da..074f8d3482 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -856,11 +856,9 @@ void game_options::reset_options()
                     "kills,notes");
 
     hp_colour.clear();
-    hp_colour.push_back(std::pair<int,int>(100, LIGHTGREY));
     hp_colour.push_back(std::pair<int,int>(50, YELLOW));
     hp_colour.push_back(std::pair<int,int>(25, RED));
     mp_colour.clear();
-    mp_colour.push_back(std::pair<int, int>(100, LIGHTGREY));
     mp_colour.push_back(std::pair<int, int>(50, YELLOW));
     mp_colour.push_back(std::pair<int, int>(25, RED));