summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-09-11 20:06:29 +0300
committerAndrei Karas <akaras@inbox.ru>2016-09-11 20:06:29 +0300
commit4808eeb101fda08e9cea5d0eff1e2387db9f1270 (patch)
treee3955036448941867697008cfd1871b0710a4d48 /src
parentbbc86b94fbe27e2ed4c05e7c2ac42037338e961e (diff)
downloadmv-4808eeb101fda08e9cea5d0eff1e2387db9f1270.tar.gz
mv-4808eeb101fda08e9cea5d0eff1e2387db9f1270.tar.bz2
mv-4808eeb101fda08e9cea5d0eff1e2387db9f1270.tar.xz
mv-4808eeb101fda08e9cea5d0eff1e2387db9f1270.zip
Remove support for legacy configuration in PlayerRelations.
Diffstat (limited to 'src')
-rw-r--r--src/being/playerrelations.cpp8
-rw-r--r--src/being/playerrelations.h2
2 files changed, 3 insertions, 7 deletions
diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp
index d996b03e3..ce79c25c5 100644
--- a/src/being/playerrelations.cpp
+++ b/src/being/playerrelations.cpp
@@ -181,13 +181,9 @@ int PlayerRelationsManager::getPlayerIgnoreStrategyIndex(
return -1;
}
-void PlayerRelationsManager::load(const bool oldConfig)
+void PlayerRelationsManager::load()
{
- Configuration *cfg;
- if (oldConfig)
- cfg = &config;
- else
- cfg = &serverConfig;
+ Configuration *cfg = &serverConfig;
clear();
mPersistIgnores = cfg->getValue(PERSIST_IGNORE_LIST, 1);
diff --git a/src/being/playerrelations.h b/src/being/playerrelations.h
index 0f76c8542..2c09cd01c 100644
--- a/src/being/playerrelations.h
+++ b/src/being/playerrelations.h
@@ -60,7 +60,7 @@ class PlayerRelationsManager final
/**
* Load configuration from our config file, or substitute defaults.
*/
- void load(const bool oldConfig = false);
+ void load();
/**
* Save configuration to our config file.