Node placement / mineral / serialization / iron freq / node_dig callback

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

diff --git a/src/mapblock.h b/src/mapblock.h
index f2d94753c9fba586f5f8bff26d6fe20220acfc4f..c9ff366794911526817fe2db5cebbae2df25db87 100644 (file)
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -363,17 +363,8 @@ public:
                Graphics-related methods
        */
        
-       /*// A quick version with nodes passed as parameters
-       u8 getFaceLight(u32 daynight_ratio, MapNode n, MapNode n2,
-                       v3s16 face_dir);*/
-       /*// A more convenient version
-       u8 getFaceLight(u32 daynight_ratio, v3s16 p, v3s16 face_dir)
-       {
-               return getFaceLight(daynight_ratio,
-                               getNodeParentNoEx(p),
-                               getNodeParentNoEx(p + face_dir),
-                               face_dir);
-       }*/
+#ifndef SERVER // Only on client
+
        u8 getFaceLight2(u32 daynight_ratio, v3s16 p, v3s16 face_dir,
                        INodeDefManager *nodemgr)
        {
@@ -383,8 +374,6 @@ public:
                                face_dir, nodemgr);
        }
        
-#ifndef SERVER // Only on client
-
 #if 1
        /*
                Thread-safely updates the whole mesh of the mapblock.
@@ -524,20 +513,20 @@ public:
        */
        
        // These don't write or read version by itself
-       void serialize(std::ostream &os, u8 version);
-       void deSerialize(std::istream &is, u8 version);
-
-       // Used after the basic ones when writing on disk (serverside)
-       void serializeDiskExtra(std::ostream &os, u8 version);
-       // In addition to doing other things, will add unknown blocks from
-       // id-name mapping to wndef
-       void deSerializeDiskExtra(std::istream &is, u8 version);
+       // Set disk to true for on-disk format, false for over-the-network format
+       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
+       void deSerialize(std::istream &is, u8 version, bool disk);
 
 private:
        /*
                Private methods
        */
 
+       void serialize_pre22(std::ostream &os, u8 version, bool disk);
+       void deSerialize_pre22(std::istream &is, u8 version, bool disk);
+
        /*
                Used only internally, because changes can't be tracked
        */