X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fserialization.h;h=86da31486f2fffd8e6504a06122d0f1dfa15d5b4;hb=58e6d25e033c76dc91aaac18fdeda92ac23fe0e1;hp=09e9555f265b178d80df0489c3da8228f20eaae2;hpb=704782c95b8a4194a9383da55d93f37fd0f7278f;p=oweals%2Fminetest.git diff --git a/src/serialization.h b/src/serialization.h index 09e9555f2..86da31486 100644 --- a/src/serialization.h +++ b/src/serialization.h @@ -1,18 +1,18 @@ /* -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. */ @@ -20,10 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef SERIALIZATION_HEADER #define SERIALIZATION_HEADER -#include "common_irrlicht.h" +#include "irrlichttypes.h" #include "exceptions.h" #include -#include "utility.h" +#include "util/pointer.h" /* Map format serialization version @@ -58,16 +58,21 @@ 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 */ // 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 26 +// Saved on disk version +#define SER_FMT_VER_HIGHEST_WRITE 25 // Lowest supported serialization version #define SER_FMT_VER_LOWEST 0 -#define ser_ver_supported(v) (v >= SER_FMT_VER_LOWEST && v <= SER_FMT_VER_HIGHEST) +#define ser_ver_supported(v) (v >= SER_FMT_VER_LOWEST && v <= SER_FMT_VER_HIGHEST_READ) /* Misc. serialization functions