diff options
Diffstat (limited to 'src/mods.cpp')
| -rw-r--r-- | src/mods.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mods.cpp b/src/mods.cpp index a81dd4604..1b1bdb07b 100644 --- a/src/mods.cpp +++ b/src/mods.cpp @@ -21,12 +21,13 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <fstream> #include "mods.h" #include "filesys.h" -#include "strfnd.h" +#include "util/strfnd.h" #include "log.h" #include "subgame.h" #include "settings.h" -#include "strfnd.h" +#include "util/strfnd.h" #include "convert_json.h" +#include "exceptions.h" static bool parseDependsLine(std::istream &is, std::string &dep, std::set<char> &symbols) @@ -256,7 +257,7 @@ void ModConfiguration::addMods(std::vector<ModSpec> new_mods) // BAD CASE: name conflict in different levels. u32 oldindex = existing_mods[mod.name]; const ModSpec &oldmod = m_unsatisfied_mods[oldindex]; - actionstream<<"WARNING: Mod name conflict detected: \"" + warningstream<<"Mod name conflict detected: \"" <<mod.name<<"\""<<std::endl <<"Will not load: "<<oldmod.path<<std::endl <<"Overridden by: "<<mod.path<<std::endl; @@ -270,7 +271,7 @@ void ModConfiguration::addMods(std::vector<ModSpec> new_mods) // VERY BAD CASE: name conflict in the same level. u32 oldindex = existing_mods[mod.name]; const ModSpec &oldmod = m_unsatisfied_mods[oldindex]; - errorstream<<"WARNING: Mod name conflict detected: \"" + warningstream<<"Mod name conflict detected: \"" <<mod.name<<"\""<<std::endl <<"Will not load: "<<oldmod.path<<std::endl <<"Will not load: "<<mod.path<<std::endl; |