Areastore: fix "attempt to index a number value"

[dragonfireclient.git] / src / serialization.h

diff --git a/src/serialization.h b/src/serialization.h
index 0d74ccf48fb7ba280ce101416dfa992180638022..ab6fe0f791201ed19392e1b124eea8ec70474f5d 100644 (file)
--- a/src/serialization.h
+++ b/src/serialization.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -59,23 +59,33 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        21: dynamic content type allocation
        22: minerals removed, facedir & wallmounted changed
        23: new node metadata format
-       24: 16-bit node ids and node timers
+       24: 16-bit node ids and node timers (never released as stable)
+       25: Improved node timer format
+       26: Never written; read the same as 25
 */
 // This represents an uninitialized or invalid format
 #define SER_FMT_VER_INVALID 255
 // Highest supported serialization version
-#define SER_FMT_VER_HIGHEST 24
+#define SER_FMT_VER_HIGHEST_READ 26
+// Saved on disk version
+#define SER_FMT_VER_HIGHEST_WRITE 25
 // Lowest supported serialization version
 #define SER_FMT_VER_LOWEST 0
+// Lowest client supported serialization version
+// Can't do < 24 anymore; we have 16-bit dynamically allocated node IDs
+// in memory; conversion just won't work in this direction.
+#define SER_FMT_CLIENT_VER_LOWEST 24
 
-#define ser_ver_supported(v) (v >= SER_FMT_VER_LOWEST && v <= SER_FMT_VER_HIGHEST)
+inline bool ser_ver_supported(s32 v) {
+       return v >= SER_FMT_VER_LOWEST && v <= SER_FMT_VER_HIGHEST_READ;
+}
 
 /*
        Misc. serialization functions
 */
 
-void compressZlib(SharedBuffer<u8> data, std::ostream &os);
-void compressZlib(const std::string &data, std::ostream &os);
+void compressZlib(SharedBuffer<u8> data, std::ostream &os, int level = -1);
+void compressZlib(const std::string &data, std::ostream &os, int level = -1);
 void decompressZlib(std::istream &is, std::ostream &os);
 
 // These choose between zlib and a self-made one according to version