Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-05 07:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switch more stuff to use the logging thing and fix segfault on player leave from server as introduced in a previous switch-to-logging commit

Browse Source
This commit is contained in:
Perttu Ahola 2011-10-16 16:28:12 +03:00
parent 67a6bc4ab5
commit 0bf533f753
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/content_nodemeta.cpp
View File

@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "content_nodemeta.h" #include "content_nodemeta.h"
#include "inventory.h" #include "inventory.h"
#include "content_mapnode.h" #include "content_mapnode.h"
#include "log.h"
/* /*
SignNodeMetadata SignNodeMetadata
@ -287,12 +288,12 @@ bool FurnaceNodeMetadata::nodeRemovalDisabled()
} }
void FurnaceNodeMetadata::inventoryModified() void FurnaceNodeMetadata::inventoryModified()
{ {
dstream<<"Furnace inventory modification callback"<<std::endl; infostream<<"Furnace inventory modification callback"<<std::endl;
} }
bool FurnaceNodeMetadata::step(float dtime) bool FurnaceNodeMetadata::step(float dtime)
{ {
if(dtime > 60.0) if(dtime > 60.0)
dstream<<"Furnace stepping a long time ("<<dtime<<")"<<std::endl; infostream<<"Furnace stepping a long time ("<<dtime<<")"<<std::endl;
// Update at a fixed frequency // Update at a fixed frequency
const float interval = 2.0; const float interval = 2.0;
m_step_accumulator += dtime; m_step_accumulator += dtime;
@ -302,7 +303,7 @@ bool FurnaceNodeMetadata::step(float dtime)
m_step_accumulator -= interval; m_step_accumulator -= interval;
dtime = interval; dtime = interval;
//dstream<<"Furnace step dtime="<<dtime<<std::endl; //infostream<<"Furnace step dtime="<<dtime<<std::endl;
InventoryList *dst_list = m_inventory->getList("dst"); InventoryList *dst_list = m_inventory->getList("dst");
assert(dst_list); assert(dst_list);
@ -334,7 +335,7 @@ bool FurnaceNodeMetadata::step(float dtime)
*/ */
if(m_fuel_time < m_fuel_totaltime) if(m_fuel_time < m_fuel_totaltime)
{ {
//dstream<<"Furnace is active"<<std::endl; //infostream<<"Furnace is active"<<std::endl;
m_fuel_time += dtime; m_fuel_time += dtime;
m_src_time += dtime; m_src_time += dtime;
if(m_src_time >= m_src_totaltime && m_src_totaltime > 0.001 if(m_src_time >= m_src_totaltime && m_src_totaltime > 0.001
@ -369,7 +370,7 @@ bool FurnaceNodeMetadata::step(float dtime)
break; break;
} }
//dstream<<"Furnace is out of fuel"<<std::endl; //infostream<<"Furnace is out of fuel"<<std::endl;
InventoryList *fuel_list = m_inventory->getList("fuel"); InventoryList *fuel_list = m_inventory->getList("fuel");
assert(fuel_list); assert(fuel_list);
@ -454,7 +455,7 @@ bool FurnaceNodeMetadata::step(float dtime)
} }
else else
{ {
//dstream<<"No fuel found"<<std::endl; //infostream<<"No fuel found"<<std::endl;
// No fuel, stop loop. // No fuel, stop loop.
m_step_accumulator = 0; m_step_accumulator = 0;
break; break;

9
src/nodemetadata.cpp
View File

@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "inventory.h" #include "inventory.h"
#include <sstream> #include <sstream>
#include "content_mapnode.h" #include "content_mapnode.h"
#include "log.h"
/* /*
NodeMetadata NodeMetadata
@ -55,7 +56,7 @@ NodeMetadata* NodeMetadata::deSerialize(std::istream &is)
if(n == NULL) if(n == NULL)
{ {
// If factory is not found, just return. // If factory is not found, just return.
dstream<<"WARNING: NodeMetadata: No factory for typeId=" infostream<<"WARNING: NodeMetadata: No factory for typeId="
<<id<<std::endl; <<id<<std::endl;
return NULL; return NULL;
} }
@ -71,7 +72,7 @@ NodeMetadata* NodeMetadata::deSerialize(std::istream &is)
} }
catch(SerializationError &e) catch(SerializationError &e)
{ {
dstream<<"WARNING: NodeMetadata: ignoring SerializationError"<<std::endl; infostream<<"WARNING: NodeMetadata: ignoring SerializationError"<<std::endl;
return NULL; return NULL;
} }
} }
@ -138,7 +139,7 @@ void NodeMetadataList::deSerialize(std::istream &is)
if(version > 1) if(version > 1)
{ {
dstream<<__FUNCTION_NAME<<": version "<<version<<" not supported" infostream<<__FUNCTION_NAME<<": version "<<version<<" not supported"
<<std::endl; <<std::endl;
throw SerializationError("NodeMetadataList::deSerialize"); throw SerializationError("NodeMetadataList::deSerialize");
} }
@ -165,7 +166,7 @@ void NodeMetadataList::deSerialize(std::istream &is)
if(m_data.find(p)) if(m_data.find(p))
{ {
dstream<<"WARNING: NodeMetadataList::deSerialize(): " infostream<<"WARNING: NodeMetadataList::deSerialize(): "
<<"already set data at position" <<"already set data at position"
<<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring." <<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring."
<<std::endl; <<std::endl;

1
src/server.cpp
View File

@ -4377,6 +4377,7 @@ void Server::handlePeerChange(PeerChange &c)
/* /*
Print out action Print out action
*/ */
if(player != NULL)
{ {
std::ostringstream os(std::ios_base::binary); std::ostringstream os(std::ios_base::binary);
for(core::map<u16, RemoteClient*>::Iterator for(core::map<u16, RemoteClient*>::Iterator