Skip to content
Permalink
Browse files

Fix addModsFormConfig typo (#6420)

  • Loading branch information
hashcacher authored and SmallJoker committed Sep 16, 2017
1 parent a1389c3 commit 45a7dd1ec4ef75b9316c518809fcef029b3d96ea
Showing with 4 additions and 4 deletions.
  1. +3 −3 src/mods.cpp
  2. +1 −1 src/mods.h
@@ -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 @@ class ModConfiguration
// 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:

0 comments on commit 45a7dd1

Please sign in to comment.