summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/setup_players.cpp8
-rw-r--r--src/gui/setup_players.h1
-rw-r--r--src/playerrelations.cpp4
3 files changed, 4 insertions, 9 deletions
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index c5dffe3d..f0d88a30 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -221,8 +221,6 @@ Setup_Players::Setup_Players():
mPlayerTable(new GuiTable(mPlayerTableModel)),
mPlayerTitleTable(new GuiTable(mPlayerTableTitleModel)),
mPlayerScrollArea(new ScrollArea(mPlayerTable)),
- mPersistIgnores(new CheckBox(_("Save player list"),
- player_relations.getPersistIgnores())),
mDefaultTrading(new CheckBox(_("Allow trading"),
player_relations.getDefault() & PlayerRelation::TRADE)),
mDefaultWhisper(new CheckBox(_("Allow whispers"),
@@ -288,9 +286,8 @@ Setup_Players::Setup_Players():
place(0, 6, mWhisperTabCheckBox);
place(2, 5, ignore_action_label);
place(2, 6, mIgnoreActionChoicesBox, 2).setPadding(2);
- place(2, 7, mPersistIgnores);
- place(2, 8, mDefaultTrading);
- place(2, 9, mDefaultWhisper);
+ place(2, 7, mDefaultTrading);
+ place(2, 8, mDefaultWhisper);
player_relations.addListener(this);
@@ -326,7 +323,6 @@ void Setup_Players::reset()
void Setup_Players::apply()
{
- player_relations.setPersistIgnores(mPersistIgnores->isSelected());
player_relations.store();
unsigned int old_default_relations = player_relations.getDefault() &
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index d7507d19..3096cab9 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -58,7 +58,6 @@ private:
GuiTable *mPlayerTitleTable;
gcn::ScrollArea *mPlayerScrollArea;
- gcn::CheckBox *mPersistIgnores;
gcn::CheckBox *mDefaultTrading;
gcn::CheckBox *mDefaultWhisper;
diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp
index 4a431e2a..a14861ef 100644
--- a/src/playerrelations.cpp
+++ b/src/playerrelations.cpp
@@ -107,7 +107,7 @@ void PlayerRelationsManager::clear()
delete names;
}
-#define PERSIST_IGNORE_LIST "persist-player-list"
+#define PERSIST_IGNORE_LIST "persistent-player-list"
#define PLAYER_IGNORE_STRATEGY "player-ignore-strategy"
#define DEFAULT_PERMISSIONS "default-player-permissions"
@@ -125,7 +125,7 @@ void PlayerRelationsManager::load()
{
clear();
- mPersistIgnores = config.getValue(PERSIST_IGNORE_LIST, 0);
+ mPersistIgnores = config.getValue(PERSIST_IGNORE_LIST, 1);
mDefaultPermissions = (int) config.getValue(DEFAULT_PERMISSIONS, mDefaultPermissions);
std::string ignore_strategy_name = config.getValue(PLAYER_IGNORE_STRATEGY, DEFAULT_IGNORE_STRATEGY);
int ignore_strategy_index = getPlayerIgnoreStrategyIndex(ignore_strategy_name);