Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 18:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix addModsFormConfig typo (#6420)

Browse Source
This commit is contained in:
Greg 2017-09-16 09:40:19 -07:00 committed by SmallJoker
parent a1389c3865
commit 45a7dd1ec4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mods.cpp
View File

@ -202,7 +202,7 @@ void ModConfiguration::addMods(const std::vector<ModSpec> &new_mods)
} }
} }
void ModConfiguration::addModsFormConfig(const std::string &settings_path, const std::set<std::string> &mods) void ModConfiguration::addModsFromConfig(const std::string &settings_path, const std::set<std::string> &mods)
{ {
Settings conf; Settings conf;
std::set<std::string> load_mod_names; std::set<std::string> load_mod_names;
@ -325,7 +325,7 @@ ServerModConfiguration::ServerModConfiguration(const std::string &worldpath):
// Load normal mods // Load normal mods
std::string worldmt = worldpath + DIR_DELIM + "world.mt"; std::string worldmt = worldpath + DIR_DELIM + "world.mt";
addModsFormConfig(worldmt, gamespec.addon_mods_paths); addModsFromConfig(worldmt, gamespec.addon_mods_paths);
} }
#ifndef SERVER #ifndef SERVER
@ -338,7 +338,7 @@ ClientModConfiguration::ClientModConfiguration(const std::string &path):
paths.insert(path_user); paths.insert(path_user);
std::string settings_path = path_user + DIR_DELIM + "mods.conf"; std::string settings_path = path_user + DIR_DELIM + "mods.conf";
addModsFormConfig(settings_path, paths); addModsFromConfig(settings_path, paths);
} }
#endif #endif

2
src/mods.h
View File

@ -92,7 +92,7 @@ protected:
// adds all mods in the set. // adds all mods in the set.
void addMods(const std::vector<ModSpec> &new_mods); void addMods(const std::vector<ModSpec> &new_mods);
void addModsFormConfig(const std::string &settings_path, const std::set<std::string> &mods); void addModsFromConfig(const std::string &settings_path, const std::set<std::string> &mods);
void checkConflictsAndDeps(); void checkConflictsAndDeps();
private: private: