Falling sand and gravel

[oweals/minetest.git] / src / client.cpp

diff --git a/src/client.cpp b/src/client.cpp
index 9752ec5e2d287bfd3cb2b4e00988dd947c621166..2326ff35db6735adb96e555f6bc37c18d2fa91d6 100644 (file)
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -848,7 +848,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
                //TimeTaker t1("TOCLIENT_ADDNODE");
 
                MapNode n;
-               n.deSerialize(&data[8], ser_version, m_nodedef);
+               n.deSerialize(&data[8], ser_version);
                
                addNode(p, n);
        }
@@ -900,16 +900,6 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
                        block = new MapBlock(&m_env.getMap(), p, this);
                        block->deSerialize(istr, ser_version);
                        sector->insertBlock(block);
-
-                       //DEBUG
-                       /*NodeMod mod;
-                       mod.type = NODEMOD_CHANGECONTENT;
-                       mod.param = CONTENT_MESE;
-                       block->setTempMod(v3s16(8,10,8), mod);
-                       block->setTempMod(v3s16(8,9,8), mod);
-                       block->setTempMod(v3s16(8,8,8), mod);
-                       block->setTempMod(v3s16(8,7,8), mod);
-                       block->setTempMod(v3s16(8,6,8), mod);*/
                }
 
 #if 0
@@ -1517,9 +1507,6 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
        }
        else if(command == TOCLIENT_TEXTURES)
        {
-               infostream<<"Client: Received textures: packet size: "<<datasize
-                               <<std::endl;
-
                io::IFileSystem *irrfs = m_device->getFileSystem();
                video::IVideoDriver *vdrv = m_device->getVideoDriver();
 
@@ -1547,8 +1534,9 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
                if(bunch_i == num_bunches - 1)
                        m_textures_received = true;
                int num_textures = readU32(is);
-               infostream<<"Client: Received textures: count: "<<num_textures
-                               <<std::endl;
+               infostream<<"Client: Received textures: bunch "<<bunch_i<<"/"
+                               <<num_bunches<<" textures="<<num_textures
+                               <<" size="<<datasize<<std::endl;
                for(int i=0; i<num_textures; i++){
                        std::string name = deSerializeString(is);
                        std::string data = deSerializeLongString(is);
@@ -2329,8 +2317,20 @@ INodeDefManager* Client::getNodeDefManager()
 {
        return m_nodedef;
 }
+ICraftDefManager* Client::getCraftDefManager()
+{
+       return NULL;
+       //return m_craftdef;
+}
 ITextureSource* Client::getTextureSource()
 {
        return m_tsrc;
 }
+u16 Client::allocateUnknownNodeId(const std::string &name)
+{
+       errorstream<<"Client::allocateUnknownNodeId(): "
+                       <<"Client cannot allocate node IDs"<<std::endl;
+       assert(0);
+       return CONTENT_IGNORE;
+}