}
}
-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;
// 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
paths.insert(path_user);
std::string settings_path = path_user + DIR_DELIM + "mods.conf";
- addModsFormConfig(settings_path, paths);
+ addModsFromConfig(settings_path, paths);
}
#endif
// 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: