From: Greg <hashcacher@users.noreply.github.com>
Date: Sat, 16 Sep 2017 16:40:19 +0000 (-0700)
Subject: Fix addModsFormConfig typo (#6420)
X-Git-Tag: 5.0.0~825
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=45a7dd1ec4ef75b9316c518809fcef029b3d96ea;p=oweals%2Fminetest.git

Fix addModsFormConfig typo (#6420)
---

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
 
diff --git a/src/mods.h b/src/mods.h
index 27464b86e..50ada328e 100644
--- a/src/mods.h
+++ b/src/mods.h
@@ -92,7 +92,7 @@ protected:
 	// adds all mods in the set.
 	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();
 private: