projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New settings tab contain all possible settings
[oweals/minetest.git]
/
src
/
serialization.h
diff --git
a/src/serialization.h
b/src/serialization.h
index cc43811551ef6b35065cb76bdca92929e3d85865..01d37d3632fb0e5f3985d42c0e7737edb59e1c0a 100644
(file)
--- a/
src/serialization.h
+++ b/
src/serialization.h
@@
-1,18
+1,18
@@
/*
/*
-Minetest
-c55
-Copyright (C) 201
0
celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 201
3
celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
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
(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.
*/
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
@@
-20,21
+20,21
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef SERIALIZATION_HEADER
#define SERIALIZATION_HEADER
#ifndef SERIALIZATION_HEADER
#define SERIALIZATION_HEADER
-#include "
common_irrlicht
.h"
+#include "
irrlichttypes
.h"
#include "exceptions.h"
#include <iostream>
#include "exceptions.h"
#include <iostream>
-#include "util
ity
.h"
+#include "util
/pointer
.h"
/*
Map format serialization version
--------------------------------
For map data (blocks, nodes, sectors).
/*
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.
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
0: original networked test with 1-byte nodes
1: update with 2-byte nodes
2: lighting is transmitted in param
@@
-57,22
+57,35
@@
with this program; if not, write to the Free Software Foundation, Inc.,
19: new content type handling
20: many existing content types translated to extended ones
21: dynamic content type allocation
19: new content type handling
20: many existing content types translated to extended ones
21: dynamic content type allocation
+ 22: minerals removed, facedir & wallmounted changed
+ 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
*/
// This represents an uninitialized or invalid format
#define SER_FMT_VER_INVALID 255
// Highest supported serialization version
*/
// This represents an uninitialized or invalid format
#define SER_FMT_VER_INVALID 255
// Highest supported serialization version
-#define SER_FMT_VER_HIGHEST 21
+#define SER_FMT_VER_HIGHEST_READ 26
+// Saved on disk version
+#define SER_FMT_VER_HIGHEST_WRITE 25
// Lowest supported serialization version
// 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
*/
/*
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
void decompressZlib(std::istream &is, std::ostream &os);
// These choose between zlib and a self-made one according to version