diff options
author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-05-20 22:29:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-20 22:29:15 +0200 |
commit | 90808a4f34dca379e872074bdfd472faf1c48cf3 (patch) | |
tree | c98e0264a2d18f8106d6fde77c49ddb46e467dbf /src/server.cpp | |
parent | 358074b2960b369dfd248bd31e08db93e114a4aa (diff) | |
download | minetest-90808a4f34dca379e872074bdfd472faf1c48cf3.tar.gz minetest-90808a4f34dca379e872074bdfd472faf1c48cf3.tar.bz2 minetest-90808a4f34dca379e872074bdfd472faf1c48cf3.zip |
Real control fix (#5787)
* Allow enabling and disabling mods.
* Re-fix 605599b6f150b89ba6539c4d088231b326adcb48
This breaks some chars like € in chat.
Instead verify is char is a non control char -> iswcntrl
Diffstat (limited to 'src/server.cpp')
-rw-r--r-- | src/server.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/server.cpp b/src/server.cpp index 6889451d9..1e8e6a5d2 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -230,32 +230,6 @@ Server::Server( modconf.printUnsatisfiedModsError(); } - Settings worldmt_settings; - std::string worldmt = m_path_world + DIR_DELIM + "world.mt"; - worldmt_settings.readConfigFile(worldmt.c_str()); - std::vector<std::string> names = worldmt_settings.getNames(); - std::set<std::string> load_mod_names; - for(std::vector<std::string>::iterator it = names.begin(); - it != names.end(); ++it) { - std::string name = *it; - if(name.compare(0,9,"load_mod_")==0 && worldmt_settings.getBool(name)) - load_mod_names.insert(name.substr(9)); - } - // complain about mods declared to be loaded, but not found - for(std::vector<ModSpec>::iterator it = m_mods.begin(); - it != m_mods.end(); ++it) - load_mod_names.erase((*it).name); - for(std::vector<ModSpec>::iterator it = unsatisfied_mods.begin(); - it != unsatisfied_mods.end(); ++it) - load_mod_names.erase((*it).name); - if(!load_mod_names.empty()) { - errorstream << "The following mods could not be found:"; - for(std::set<std::string>::iterator it = load_mod_names.begin(); - it != load_mod_names.end(); ++it) - errorstream << " \"" << (*it) << "\""; - errorstream << std::endl; - } - //lock environment MutexAutoLock envlock(m_env_mutex); |