1 files changed, 24 insertions, 9 deletions

diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 802a5b2e..cbe0e264 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/setup_players.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
 #include "configuration.h"
 #include "log.h"
 
@@ -214,6 +214,7 @@ public:
 #define ACTION_STRATEGY "strategy"
 #define ACTION_WHISPER_TAB "whisper tab"
 #define ACTION_SHOW_GENDER "show gender"
+#define ACTION_ENABLE_CHAT_LOG "enable log"
 
 Setup_Players::Setup_Players():
     mPlayerTableTitleModel(new StaticTableModel(1, COLUMNS_NR)),
@@ -226,10 +227,12 @@ Setup_Players::Setup_Players():
     mDefaultWhisper(new CheckBox(_("Allow whispers"),
                 player_relations.getDefault() & PlayerRelation::WHISPER)),
     mDeleteButton(new Button(_("Delete"), ACTION_DELETE, this)),
-    mWhisperTab(config.getValue("whispertab", false)),
+    mWhisperTab(config.getBoolValue("whispertab")),
     mWhisperTabCheckBox(new CheckBox(_("Put all whispers in tabs"), mWhisperTab)),
-    mShowGender(config.getValue("showgender", false)),
-    mShowGenderCheckBox(new CheckBox(_("Show gender"), mShowGender))
+    mShowGender(config.getBoolValue("showgender")),
+    mShowGenderCheckBox(new CheckBox(_("Show gender"), mShowGender)),
+    mEnableChatLog(config.getBoolValue("enableChatLog")),
+    mEnableChatLogCheckBox(new CheckBox(_("Enable Chat log"), mEnableChatLog))
 {
     setName(_("Players"));
 
@@ -279,6 +282,9 @@ Setup_Players::Setup_Players():
     mShowGenderCheckBox->setActionEventId(ACTION_SHOW_GENDER);
     mShowGenderCheckBox->addActionListener(this);
 
+    mEnableChatLogCheckBox->setActionEventId(ACTION_ENABLE_CHAT_LOG);
+    mEnableChatLogCheckBox->addActionListener(this);
+
     reset();
 
     // Do the layout
@@ -289,6 +295,7 @@ Setup_Players::Setup_Players():
     place(0, 1, mPlayerScrollArea, 4, 4).setPadding(2);
     place(0, 5, mDeleteButton);
     place(0, 6, mShowGenderCheckBox, 2).setPadding(2);
+    place(0, 7, mEnableChatLogCheckBox, 2).setPadding(2);
     place(2, 5, ignore_action_label);
     place(2, 6, mIgnoreActionChoicesBox, 2).setPadding(2);
     place(2, 7, mDefaultTrading);
@@ -341,20 +348,24 @@ void Setup_Players::apply()
                                        PlayerRelation::WHISPER : 0));
     config.setValue("whispertab", mWhisperTab);
 
-    bool showGender = config.getValue("showgender", false);
+    bool showGender = config.getBoolValue("showgender");
 
     config.setValue("showgender", mShowGender);
 
-    if (beingManager && mShowGender != showGender)
-        beingManager->updatePlayerNames();
+    if (actorSpriteManager && mShowGender != showGender)
+        actorSpriteManager->updatePlayerNames();
+
+    config.setValue("enableChatLog", mEnableChatLog);
 }
 
 void Setup_Players::cancel()
 {
-    mWhisperTab = config.getValue("whispertab", false);
+    mWhisperTab = config.getBoolValue("whispertab");
     mWhisperTabCheckBox->setSelected(mWhisperTab);
-    mShowGender = config.getValue("showgender", false);
+    mShowGender = config.getBoolValue("showgender");
     mShowGenderCheckBox->setSelected(mShowGender);
+    mEnableChatLog = config.getBoolValue("enableChatLog");
+    mEnableChatLogCheckBox->setSelected(mEnableChatLog);
 }
 
 void Setup_Players::action(const gcn::ActionEvent &event)
@@ -402,6 +413,10 @@ void Setup_Players::action(const gcn::ActionEvent &event)
     {
         mShowGender = mShowGenderCheckBox->isSelected();
     }
+    else if (event.getId() == ACTION_ENABLE_CHAT_LOG)
+    {
+        mEnableChatLog = mEnableChatLogCheckBox->isSelected();
+    }
 }
 
 void Setup_Players::updatedPlayer(const std::string &name)