mirror of
https://github.com/minetest/minetest.git
synced 2024-09-12 00:26:50 +02:00
Fix addModsFormConfig typo (#6420)
This commit is contained in:
parent
a1389c3865
commit
45a7dd1ec4
@ -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
|
||||
|
||||
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user