diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-06-26 00:03:58 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-06-26 00:03:58 +0300 |
| commit | cb130d9158dc4e9c456d088d5e214b7d829ccc3a (patch) | |
| tree | d0cbfe1549e74d383de10daafa02ad1bb3315821 /src/client.cpp | |
| parent | a80025c352fb91ff295423940b3ded22755b70f0 (diff) | |
| download | minetest-cb130d9158dc4e9c456d088d5e214b7d829ccc3a.tar.gz minetest-cb130d9158dc4e9c456d088d5e214b7d829ccc3a.tar.bz2 minetest-cb130d9158dc4e9c456d088d5e214b7d829ccc3a.zip | |
cleaned map stuff
Diffstat (limited to 'src/client.cpp')
| -rw-r--r-- | src/client.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/client.cpp b/src/client.cpp index abc056505..f97acfd43 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "main.h" #include <sstream> #include "porting.h" +#include "mapsector.h" void * MeshUpdateThread::Thread() { @@ -715,15 +716,16 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) //TimeTaker timer("MapBlock deSerialize"); // 0ms - try{ - block = sector->getBlockNoCreate(p.Y); + block = sector->getBlockNoCreateNoEx(p.Y); + if(block) + { /* Update an existing block */ //dstream<<"Updating"<<std::endl; block->deSerialize(istr, ser_version); } - catch(InvalidPositionException &e) + else { /* Create a new block @@ -952,6 +954,8 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) } else if(command == TOCLIENT_SECTORMETA) { + dstream<<"Client received DEPRECATED TOCLIENT_SECTORMETA"<<std::endl; +#if 0 /* [0] u16 command [2] u8 sector count @@ -987,6 +991,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) ((ClientMap&)m_env.getMap()).deSerializeSector(pos, is); } } //envlock +#endif } else if(command == TOCLIENT_INVENTORY) { |