oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-02 16:38:41 +00:00
Code Wiki Activity

Replace PP with direct printing

Browse source
This commit is contained in:
numzero 2023-06-25 21:18:12 +03:00 • committed by sfan5
parent de77fe8ade
commit 3b74cc4a41
18 changed files with 110 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/serverenvironment.cpp
View file

@ -48,6 +48,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#if USE_LEVELDB
#include "database/database-leveldb.h"
#endif
#include "irrlicht_changes/printing.h"
#include "server/luaentity_sao.h"
#include "server/player_sao.h"
@ -1282,7 +1283,7 @@ void ServerEnvironment::clearObjects(ClearObjectsMode mode)
MapBlock *block = m_map->emergeBlock(p, false);
if (!block) {
errorstream << "ServerEnvironment::clearObjects(): "
<< "Failed to emerge block " << PP(p) << std::endl;
<< "Failed to emerge block " << p << std::endl;
continue;
}
@ -1858,7 +1859,7 @@ u16 ServerEnvironment::addActiveObjectRaw(ServerActiveObject *object,
v3s16 p = floatToInt(objectpos, BS);
errorstream<<"ServerEnvironment::addActiveObjectRaw(): "
<<"could not emerge block for storing id="<<object->getId()
<<" statically (pos="<<PP(p)<<")"<<std::endl;
<<" statically (pos="<<p<<")"<<std::endl;
}
}
@ -1906,7 +1907,7 @@ void ServerEnvironment::removeRemovedObjects()
warningstream << "ServerEnvironment::removeRemovedObjects(): "
<< "id=" << id << " m_static_exists=true but "
<< "static data doesn't actually exist in "
<< PP(obj->m_static_block) << std::endl;
<< obj->m_static_block << std::endl;
}
} else {
infostream << "Failed to emerge block from which an object to "
@ -1996,7 +1997,7 @@ void ServerEnvironment::activateObjects(MapBlock *block, u32 dtime_s)
if (!obj) {
errorstream << "ServerEnvironment::activateObjects(): "
<< "failed to create active object from static object "
<< "in block " << PP(s_obj.pos / BS)
<< "in block " << (s_obj.pos / BS)
<< " type=" << (int)s_obj.type << " data:" << std::endl;
print_hexdump(verbosestream, s_obj.data);
@ -2004,7 +2005,7 @@ void ServerEnvironment::activateObjects(MapBlock *block, u32 dtime_s)
continue;
}
verbosestream << "ServerEnvironment::activateObjects(): "
<< "activated static object pos=" << PP(s_obj.pos / BS)
<< "activated static object pos=" << (s_obj.pos / BS)
<< " type=" << (int)s_obj.type << std::endl;
// This will also add the object to the active static list
addActiveObjectRaw(obj, false, dtime_s);
@ -2085,7 +2086,7 @@ void ServerEnvironment::deactivateFarObjects(bool _force_delete)
verbosestream << "ServerEnvironment::deactivateFarObjects(): "
<< "deactivating object id=" << id << " on inactive block "
<< PP(blockpos_o) << std::endl;
<< blockpos_o << std::endl;
// If known by some client, don't immediately delete.
bool pending_delete = (obj->m_known_by_count > 0 && !force_delete);
@ -2119,7 +2120,7 @@ void ServerEnvironment::deactivateFarObjects(bool _force_delete)
warningstream << "ServerEnvironment::deactivateFarObjects(): "
<< "id=" << id << " m_static_exists=true but "
<< "static data doesn't actually exist in "
<< PP(obj->m_static_block) << std::endl;
<< obj->m_static_block << std::endl;
}
}
}
@ -2189,7 +2190,7 @@ void ServerEnvironment::deleteStaticFromBlock(
block = m_map->emergeBlock(obj->m_static_block, false);
if (!block) {
if (!no_emerge)
errorstream << "ServerEnv: Failed to emerge block " << PP(obj->m_static_block)
errorstream << "ServerEnv: Failed to emerge block " << obj->m_static_block
<< " when deleting static data of object from it. id=" << id << std::endl;
return;
}
@ -2216,7 +2217,7 @@ bool ServerEnvironment::saveStaticToBlock(
}
if (!block) {
errorstream << "ServerEnv: Failed to emerge block " << PP(obj->m_static_block)
errorstream << "ServerEnv: Failed to emerge block " << obj->m_static_block
<< " when saving static data of object to it. id=" << store_id << std::endl;
return false;
}