Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstrea...

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

diff --git a/src/client.cpp b/src/client.cpp
index abc05650541e5bb7e9ceae557085131ef5b44bd4..e86b3a4f85ad0fafd9575022c46300372e65a193 100644 (file)
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -722,6 +722,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
                                */
                                //dstream<<"Updating"<<std::endl;
                                block->deSerialize(istr, ser_version);
+                               //block->setChangedFlag();
                        }
                        catch(InvalidPositionException &e)
                        {
@@ -732,6 +733,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
                                block = new MapBlock(&m_env.getMap(), p);
                                block->deSerialize(istr, ser_version);
                                sector->insertBlock(block);
+                               //block->setChangedFlag();
 
                                //DEBUG
                                /*NodeMod mod;
@@ -742,6 +744,27 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
                                block->setTempMod(v3s16(8,8,8), mod);
                                block->setTempMod(v3s16(8,7,8), mod);
                                block->setTempMod(v3s16(8,6,8), mod);*/
+#if 0
+                               /*
+                                       Add some coulds
+                                       Well, this is a dumb way to do it, they should just
+                                       be drawn as separate objects. But the looks of them
+                                       can be tested this way.
+                               */
+                               if(p.Y == 3)
+                               {
+                                       NodeMod mod;
+                                       mod.type = NODEMOD_CHANGECONTENT;
+                                       mod.param = CONTENT_CLOUD;
+                                       v3s16 p2;
+                                       p2.Y = 8;
+                                       for(p2.X=3; p2.X<=13; p2.X++)
+                                       for(p2.Z=3; p2.Z<=13; p2.Z++)
+                                       {
+                                               block->setTempMod(p2, mod);
+                                       }
+                               }
+#endif
                        }
                } //envlock
 
@@ -772,7 +795,6 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
                */
 
                //m_env.getClientMap().updateMeshes(block->getPos(), getDayNightRatio());
-               
                /*
                        Add it to mesh update queue and set it to be acknowledged after update.
                */