diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2015-10-14 01:26:03 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2015-10-14 01:36:48 -0400 |
| commit | 96cc5b34fe0151d2a1498eaaafb205757db346c4 (patch) | |
| tree | e612a2d78086427cc5f555b82c597dcf9dd13b74 /src/nodedef.cpp | |
| parent | 2139d7d45fb1a8ed250ad96c9975c581f02f72a9 (diff) | |
| download | minetest-96cc5b34fe0151d2a1498eaaafb205757db346c4.tar.gz minetest-96cc5b34fe0151d2a1498eaaafb205757db346c4.tar.bz2 minetest-96cc5b34fe0151d2a1498eaaafb205757db346c4.zip | |
Use warningstream for log messages with WARNING
Remove DTIME macro and its uses, too
Diffstat (limited to 'src/nodedef.cpp')
| -rw-r--r-- | src/nodedef.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nodedef.cpp b/src/nodedef.cpp index 5a1578bba..b5ccc3b94 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -653,7 +653,7 @@ content_t CNodeDefManager::set(const std::string &name, const ContentFeatures &d // Don't allow redefining ignore (but allow air and unknown) if (name == "ignore") { - infostream << "NodeDefManager: WARNING: Ignoring " + warningstream << "NodeDefManager: Ignoring " "CONTENT_IGNORE redefinition"<<std::endl; return CONTENT_IGNORE; } @@ -663,7 +663,7 @@ content_t CNodeDefManager::set(const std::string &name, const ContentFeatures &d // Get new id id = allocateId(); if (id == CONTENT_IGNORE) { - infostream << "NodeDefManager: WARNING: Absolute " + warningstream << "NodeDefManager: Absolute " "limit reached" << std::endl; return CONTENT_IGNORE; } @@ -1112,12 +1112,12 @@ void CNodeDefManager::deSerialize(std::istream &is) // Check error conditions if (i == CONTENT_IGNORE || i == CONTENT_AIR || i == CONTENT_UNKNOWN) { - infostream << "NodeDefManager::deSerialize(): WARNING: " + warningstream << "NodeDefManager::deSerialize(): " "not changing builtin node " << i << std::endl; continue; } if (f.name == "") { - infostream << "NodeDefManager::deSerialize(): WARNING: " + warningstream << "NodeDefManager::deSerialize(): " "received empty name" << std::endl; continue; } @@ -1125,7 +1125,7 @@ void CNodeDefManager::deSerialize(std::istream &is) // Ignore aliases u16 existing_id; if (m_name_id_mapping.getId(f.name, existing_id) && i != existing_id) { - infostream << "NodeDefManager::deSerialize(): WARNING: " + warningstream << "NodeDefManager::deSerialize(): " "already defined with different ID: " << f.name << std::endl; continue; } |