X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fserialization.h;h=f399983c49a09cb5b901ac439040453d9deca99f;hb=68f9263a24a345435d2310ab559ce8a811ef0427;hp=24648c1fc83dc5f9535adbdb26c2377652da9374;hpb=d0ea6f9920d30f46d1f5d44e8823a8d932f9f29d;p=dragonfireclient.git diff --git a/src/serialization.h b/src/serialization.h index 24648c1fc..f399983c4 100644 --- a/src/serialization.h +++ b/src/serialization.h @@ -1,6 +1,6 @@ /* -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 Lesser General Public License as published by @@ -17,10 +17,9 @@ 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 "util/pointer.h" @@ -30,11 +29,11 @@ with this program; if not, write to the Free Software Foundation, Inc., -------------------------------- 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 decompressZlib(std::istream &is, 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, size_t limit = 0); // 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 -