Split the note_chat_messages option into note_chat_messages and note_dgl_messages.

Webtiles chat and DGL messages have different functionality and are used in
completely different ways. Webtiles chat doesn't necessarily involve the
player of the game being spectated (and indeed it often seems not to have
anything to do with the game), while DGL messages are invisible unless the
player chooses to read them and thus usually consist of a conversation
between the player typing in notes and a spectator. Not logging DGL
messages (which was recently made default) is thus usually undesirable
because it means logging only one side of a conversation (the player's).

The new option note_dgl_messages defaults to true.

4 files changed, 13 insertions, 5 deletions

diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index 91b4e01ad7..4701a1f672 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -119,7 +119,7 @@ The contents of this text are:
                 user_note_prefix, note_items, note_monsters,
                 note_hp_percent, note_skill_levels, note_all_skill_levels,
                 note_skill_max, note_xom_effects, note_messages,
-                note_chat_messages
+                note_chat_messages, note_dgl_messages
 5-  Miscellaneous.
 5-a     All OS.
                 mouse_input, wiz_mode, char_set, colour, cset, feature,
@@ -2093,8 +2093,13 @@ note_messages += <regex>, <regex>, ...
              note_messages += Your scales start
 
 note_chat_messages = false
-        If set to false, this will disable logging of chat messages
-        from other players. (This setting only applies on the online
+        If set to false, this will disable logging of webtiles chat
+        messages from other players. (This setting only applies on the
+        online servers).
+
+note_dgl_messages = true
+        If set to false, this will disable logging of DGL messages
+        sent by other players. (This setting only applies on the online
         servers).
 
 
diff --git a/crawl-ref/source/dgl-message.cc b/crawl-ref/source/dgl-message.cc
index dbb4803300..6e3ddb3651 100644
--- a/crawl-ref/source/dgl-message.cc
+++ b/crawl-ref/source/dgl-message.cc
@@ -35,7 +35,7 @@ static void _show_message_line(string line)
         fs.textcolor(LIGHTGREY);
         fs.cprintf("%s", line.c_str());
         formatted_mpr(fs, MSGCH_PLAIN, 0);
-        if (Options.note_chat_messages)
+        if (Options.note_dgl_messages)
             take_note(Note(NOTE_MESSAGE, MSGCH_PLAIN, 0,
                            (sender + ": " + line).c_str()));
     }
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index f9476bf89d..ba0262db0e 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -808,6 +808,7 @@ void game_options::reset_options()
     note_skill_max         = true;
     note_xom_effects       = true;
     note_chat_messages     = false;
+    note_dgl_messages      = true;
     note_hp_percent        = 5;
 
     // [ds] Grumble grumble.
@@ -2675,6 +2676,7 @@ void game_options::read_option_line(const string &str, bool runscript)
     else BOOL_OPTION(note_skill_max);
     else BOOL_OPTION(note_xom_effects);
     else BOOL_OPTION(note_chat_messages);
+    else BOOL_OPTION(note_dgl_messages);
     else BOOL_OPTION(clear_messages);
     else BOOL_OPTION(show_more);
     else BOOL_OPTION(small_more);
diff --git a/crawl-ref/source/options.h b/crawl-ref/source/options.h
index 3cde48aac0..182d01c0d7 100644
--- a/crawl-ref/source/options.h
+++ b/crawl-ref/source/options.h
@@ -188,7 +188,8 @@ public:
     string      user_note_prefix; // Prefix for user notes
     int         note_hp_percent;  // percentage hp for notetaking
     bool        note_xom_effects; // take note of all Xom effects
-    bool        note_chat_messages; // log chat in DGL/Webtiles
+    bool        note_chat_messages; // log chat in Webtiles
+    bool        note_dgl_messages; // log chat in DGL
     confirm_level_type easy_confirm;    // make yesno() confirming easier
     bool        easy_quit_item_prompts; // make item prompts quitable on space
     confirm_prompt_type allow_self_target;      // yes, no, prompt