* Fixed Vault:8 level being generated with no rune (cbus).

* Dropped odds of statue vault.
* Take note of messages received in dgamelaunch chat.
* crawl -vscores, etc. should not attempt to create save/morgue directories
  (Marc).
* Changed wording of "Foo wielding bar comes into view" to
  "Foo comes into view. It is wielding bar.".
* Suppress curse status display of monster items.
* TSO worshippers are no longer warned when stabbing monsters if TSO doesn't
  object to stabbing those monsters.
* Wand zap status is now {zapped: N} instead of {zapped N times} to reduce
  verbosity.

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

1 files changed, 11 insertions, 1 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 2c0801e494..1419e6348b 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -2785,12 +2785,19 @@ static void show_message_line(std::string line)
         mpr(line.c_str());
     else
     {
+        take_note(Note( NOTE_MESSAGE, MSGCH_PLAIN, 0, line.c_str() ));
+        
         std::string sender = line.substr(0, sender_pos);
         line = line.substr(sender_pos + 1);
         trim_string(line);
         // XXX: Eventually fix mpr so it can do a different colour for
         // the sender.
-        mprf("%s: %s", sender.c_str(), line.c_str());
+        formatted_string fs;
+        fs.textcolor(WHITE);
+        fs.cprintf("%s: ", sender.c_str());
+        fs.textcolor(LIGHTGREY);
+        fs.cprintf("%s", line.c_str());
+        formatted_mpr(fs, MSGCH_PLAIN, 0);
     }
 }
 
@@ -3289,6 +3296,8 @@ static void close_door(int door_x, int door_y)
 // returns true if a new character
 static bool initialise(void)
 {
+    Options.fixup_options();
+    
     you.symbol = '@';
     you.colour = LIGHTGREY;
 
@@ -3407,6 +3416,7 @@ static bool initialise(void)
     clua.runhook("chk_startgame", "b", newc);
     std::string yname = you.your_name;
     read_init_file(true);
+    Options.fixup_options();
     strncpy(you.your_name, yname.c_str(), kNameLen);
     you.your_name[kNameLen - 1] = 0;