diff options
| -rw-r--r-- | src/test.cpp | 14 | ||||
| -rw-r--r-- | src/voxel.h | 8 |
2 files changed, 13 insertions, 9 deletions
diff --git a/src/test.cpp b/src/test.cpp index 45851a7e3..6588f113c 100644 --- a/src/test.cpp +++ b/src/test.cpp @@ -1184,8 +1184,10 @@ struct TestConnection infostream<<"Sending data (size="<<datasize<<"):"; for(int i=0; i<datasize && i<20; i++){ - if(i%2==0) DEBUGPRINT(" "); - DEBUGPRINT("%.2X", ((int)((const char*)*data1)[i])&0xff); + if(i%2==0) infostream<<" "; + char buf[10]; + snprintf(buf, 10, "%.2X", ((int)((const char*)*data1)[i])&0xff); + infostream<<buf; } if(datasize>20) infostream<<"..."; @@ -1216,10 +1218,12 @@ struct TestConnection <<", size="<<size <<std::endl; - infostream<<"Received data (size="<<size<<"):"; + infostream<<"Received data (size="<<size<<"): "; for(int i=0; i<size && i<20; i++){ - if(i%2==0) DEBUGPRINT(" "); - DEBUGPRINT("%.2X", ((int)(recvdata[i]))&0xff); + if(i%2==0) infostream<<" "; + char buf[10]; + snprintf(buf, 10, "%.2X", ((int)(recvdata[i]))&0xff); + infostream<<buf; } if(size>20) infostream<<"..."; diff --git a/src/voxel.h b/src/voxel.h index 46864e06e..291b51e03 100644 --- a/src/voxel.h +++ b/src/voxel.h @@ -364,11 +364,11 @@ public: if(m_flags[m_area.index(p)] & VOXELFLAG_INEXISTENT) { - dstream<<"EXCEPT: VoxelManipulator::getNode(): " + /*dstream<<"EXCEPT: VoxelManipulator::getNode(): " <<"p=("<<p.X<<","<<p.Y<<","<<p.Z<<")" <<", index="<<m_area.index(p) <<", flags="<<(int)m_flags[m_area.index(p)] - <<" is inexistent"<<std::endl; + <<" is inexistent"<<std::endl;*/ throw InvalidPositionException ("VoxelManipulator: getNode: inexistent"); } @@ -400,11 +400,11 @@ public: if(m_flags[m_area.index(p)] & VOXELFLAG_INEXISTENT) { - dstream<<"EXCEPT: VoxelManipulator::getNode(): " + /*dstream<<"EXCEPT: VoxelManipulator::getNode(): " <<"p=("<<p.X<<","<<p.Y<<","<<p.Z<<")" <<", index="<<m_area.index(p) <<", flags="<<(int)m_flags[m_area.index(p)] - <<" is inexistent"<<std::endl; + <<" is inexistent"<<std::endl;*/ throw InvalidPositionException ("VoxelManipulator: getNode: inexistent"); } |