summaryrefslogtreecommitdiff
path: root/src/mods.cpp
diff options
context:
space:
mode:
authorGreg <hashcacher@users.noreply.github.com>2017-09-16 09:40:19 -0700
committerSmallJoker <SmallJoker@users.noreply.github.com>2017-09-16 18:40:19 +0200
commit45a7dd1ec4ef75b9316c518809fcef029b3d96ea (patch)
treef25cc6a83351d4e6c4878be58dea79870666a42d /src/mods.cpp
parenta1389c38658fe69c3bd25c3099bae9a4e51ed401 (diff)
downloadminetest-45a7dd1ec4ef75b9316c518809fcef029b3d96ea.tar.gz
minetest-45a7dd1ec4ef75b9316c518809fcef029b3d96ea.tar.bz2
minetest-45a7dd1ec4ef75b9316c518809fcef029b3d96ea.zip
Fix addModsFormConfig typo (#6420)
Diffstat (limited to 'src/mods.cpp')
-rw-r--r--src/mods.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mods.cpp b/src/mods.cpp
index 148ea6c53..405cf9c79 100644
--- a/src/mods.cpp
+++ b/src/mods.cpp
@@ -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;
std::set<std::string> load_mod_names;
@@ -325,7 +325,7 @@ ServerModConfiguration::ServerModConfiguration(const std::string &worldpath):
// Load normal mods
std::string worldmt = worldpath + DIR_DELIM + "world.mt";
- addModsFormConfig(worldmt, gamespec.addon_mods_paths);
+ addModsFromConfig(worldmt, gamespec.addon_mods_paths);
}
#ifndef SERVER
@@ -338,7 +338,7 @@ ClientModConfiguration::ClientModConfiguration(const std::string &path):
paths.insert(path_user);
std::string settings_path = path_user + DIR_DELIM + "mods.conf";
- addModsFormConfig(settings_path, paths);
+ addModsFromConfig(settings_path, paths);
}
#endif