0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove reliance on static acquaintances_initialized variable

Browse source 
It wasn't set to true anywhere before anyway
This commit is contained in:
Charles Dang 2016-01-28 09:20:16 +11:00
parent 8b31f8fa28
commit 9a11e9e86a
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game_preferences.cpp
View file

@ -64,8 +64,6 @@ std::map<std::string, std::vector<std::string> > history_map;
std::map<std::string, preferences::acquaintance> acquaintances;
bool acquaintances_initialized = false;
std::vector<std::string> mp_modifications;
bool mp_modifications_initialized = false;
std::vector<std::string> sp_modifications;
@ -241,8 +239,7 @@ admin_authentication_reset::~admin_authentication_reset()
}
static void load_acquaintances() {
if(!acquaintances_initialized) {
acquaintances.clear();
if(acquaintances.empty()) {
BOOST_FOREACH(const config &acfg, preferences::get_prefs()->child_range("acquaintance")) {
acquaintance ac = acquaintance(acfg);
acquaintances[ac.get_nick()] = ac;