X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fserialization.h;h=7f8b833825f86da4dfc0beebfc18724df3bd4457;hb=b5f7249a7edc25077d84b27b38552228b92ff763;hp=09e9555f265b178d80df0489c3da8228f20eaae2;hpb=704782c95b8a4194a9383da55d93f37fd0f7278f;p=oweals%2Fminetest.git diff --git a/src/serialization.h b/src/serialization.h index 09e9555f2..7f8b83382 100644 --- a/src/serialization.h +++ b/src/serialization.h @@ -1,40 +1,39 @@ /* -Minetest-c55 -Copyright (C) 2010 celeron55, Perttu Ahola +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +GNU Lesser General Public License for more details. -You should have received a copy of the GNU General Public License along +You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef SERIALIZATION_HEADER -#define SERIALIZATION_HEADER +#pragma once -#include "common_irrlicht.h" +#include "irrlichttypes.h" #include "exceptions.h" #include -#include "utility.h" +#include "util/pointer.h" /* Map format serialization version -------------------------------- For map data (blocks, nodes, sectors). - + NOTE: The goal is to increment this so that saved maps will be loadable by any version. Other compatibility is not maintained. - + 0: original networked test with 1-byte nodes 1: update with 2-byte nodes 2: lighting is transmitted in param @@ -58,29 +57,39 @@ with this program; if not, write to the Free Software Foundation, Inc., 20: many existing content types translated to extended ones 21: dynamic content type allocation 22: minerals removed, facedir & wallmounted changed - 23: NodeTimers, new node metadata format + 23: new node metadata format + 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 + 27: Added light spreading flags to blocks + 28: Added "private" flag to NodeMetadata */ // This represents an uninitialized or invalid format #define SER_FMT_VER_INVALID 255 // Highest supported serialization version -#define SER_FMT_VER_HIGHEST 23 +#define SER_FMT_VER_HIGHEST_READ 28 +// Saved on disk version +#define SER_FMT_VER_HIGHEST_WRITE 28 // Lowest supported serialization version -#define SER_FMT_VER_LOWEST 0 +#define SER_FMT_VER_LOWEST_READ 0 +// Lowest serialization version for writing +// 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_VER_LOWEST_WRITE 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_READ && v <= SER_FMT_VER_HIGHEST_READ; +} /* Misc. serialization functions */ -void compressZlib(SharedBuffer data, std::ostream &os); -void compressZlib(const std::string &data, std::ostream &os); +void compressZlib(const u8 *data, size_t data_size, 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 -void compress(SharedBuffer data, std::ostream &os, u8 version); +void compress(const SharedBuffer &data, std::ostream &os, u8 version); //void compress(const std::string &data, std::ostream &os, u8 version); void decompress(std::istream &is, std::ostream &os, u8 version); - -#endif -