projects
/
zefram
/
minetest
/
minetest_engine.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e57dc4e
)
Log non-fatal mod name conflict to actionstream instead of errorstream
author
Kahrl
<kahrl@gmx.net>
Tue, 21 May 2013 12:56:43 +0000
(14:56 +0200)
committer
Kahrl
<kahrl@gmx.net>
Tue, 21 May 2013 12:56:43 +0000
(14:56 +0200)
src/mods.cpp
patch
|
blob
|
history
diff --git
a/src/mods.cpp
b/src/mods.cpp
index 9097f5708129804acdebfb9d61a0a90d74d33f64..9bcf73aa7c303fa35dc50a4579618f8094133327 100644
(file)
--- a/
src/mods.cpp
+++ b/
src/mods.cpp
@@
-309,7
+309,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];
-
error
stream<<"WARNING: Mod name conflict detected: \""
+
action
stream<<"WARNING: Mod name conflict detected: \""
<<mod.name<<"\""<<std::endl
<<"Will not load: "<<oldmod.path<<std::endl
<<"Overridden by: "<<mod.path<<std::endl;