Use proper CMakeLists.txt for network and client directories

[oweals/minetest.git] / src / mapblock.h

diff --git a/src/mapblock.h b/src/mapblock.h
index 76c82c083c065b520d9ecc73dd6e35f937ed208c..76ba94c3437baa9653f5b77428f0db0009ff2749 100644 (file)
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -166,6 +166,29 @@ public:
                        }
                }
        }
+       void raiseModified(u32 mod, const char *reason)
+       {
+               if (mod > m_modified){
+                       m_modified = mod;
+                       m_modified_reason = reason;
+                       m_modified_reason_too_long = false;
+
+                       if (m_modified >= MOD_STATE_WRITE_AT_UNLOAD){
+                               m_disk_timestamp = m_timestamp;
+                       }
+               }
+               else if (mod == m_modified){
+                       if (!m_modified_reason_too_long){
+                               if (m_modified_reason.size() < 40)
+                                       m_modified_reason += ", " + std::string(reason);
+                               else{
+                                       m_modified_reason += "...";
+                                       m_modified_reason_too_long = true;
+                               }
+                       }
+               }
+       }
+
        u32 getModified()
        {
                return m_modified;
@@ -471,6 +494,7 @@ public:
        
        // These don't write or read version by itself
        // Set disk to true for on-disk format, false for over-the-network format
+       // Precondition: version >= SER_FMT_CLIENT_VER_LOWEST
        void serialize(std::ostream &os, u8 version, bool disk);
        // If disk == true: In addition to doing other things, will add
        // unknown blocks from id-name mapping to wndef
@@ -590,6 +614,8 @@ private:
        int m_refcount;
 };
 
+typedef std::vector<MapBlock*> MapBlockVect;
+
 inline bool blockpos_over_limit(v3s16 p)
 {
        return
@@ -619,6 +645,16 @@ inline s16 getNodeBlockY(s16 y)
        return getContainerPos(y, MAP_BLOCKSIZE);
 }
 
+inline void getNodeBlockPosWithOffset(const v3s16 &p, v3s16 &block, v3s16 &offset)
+{
+       getContainerPosWithOffset(p, MAP_BLOCKSIZE, block, offset);
+}
+
+inline void getNodeSectorPosWithOffset(const v2s16 &p, v2s16 &block, v2s16 &offset)
+{
+       getContainerPosWithOffset(p, MAP_BLOCKSIZE, block, offset);
+}
+
 /*
        Get a quick string to describe what a block actually contains
 */