From 4808eeb101fda08e9cea5d0eff1e2387db9f1270 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 11 Sep 2016 20:06:29 +0300 Subject: Remove support for legacy configuration in PlayerRelations. --- src/being/playerrelations.cpp | 8 ++------ src/being/playerrelations.h | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src/being') 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. -- cgit v1.2.3-70-g09d2