Illuna-Minetest
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Log non-fatal mod name conflict to actionstream instead of errorstream

master
Kahrl 2013-05-21 14:56:43 +02:00
parent e57dc4ef18
commit 4a9fe1a1d5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mods.cpp
View File

@ -309,7 +309,7 @@ void ModConfiguration::addMods(std::vector<ModSpec> new_mods)
// BAD CASE: name conflict in different levels. // BAD CASE: name conflict in different levels.
u32 oldindex = existing_mods[mod.name]; u32 oldindex = existing_mods[mod.name];
const ModSpec &oldmod = m_unsatisfied_mods[oldindex]; const ModSpec &oldmod = m_unsatisfied_mods[oldindex];
errorstream<<"WARNING: Mod name conflict detected: \"" actionstream<<"WARNING: Mod name conflict detected: \""
<<mod.name<<"\""<<std::endl <<mod.name<<"\""<<std::endl
<<"Will not load: "<<oldmod.path<<std::endl <<"Will not load: "<<oldmod.path<<std::endl
<<"Overridden by: "<<mod.path<<std::endl; <<"Overridden by: "<<mod.path<<std::endl;