Fix build with redis

[oweals/minetest.git] / src / mapchunk.h

diff --git a/src/mapchunk.h b/src/mapchunk.h
index 1f89b38a7de4f6c1332b159463323d6a923d68bb..a70de8711bbe98ea73e0262967455f3a53c4f8af 100644 (file)
--- a/src/mapchunk.h
+++ b/src/mapchunk.h
@@ -1,18 +1,18 @@
 /*
-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 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,11 +20,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MAPCHUNK_HEADER
 #define MAPCHUNK_HEADER
 
+/*
+       TODO: Remove
+*/
+
+#if 0
 /*
        MapChunk contains map-generation-time metadata for an area of
        some MapSectors. (something like 16x16)
 */
 
+// These should fit in 8 bits, as they are saved as such.
 enum{
        GENERATED_FULLY = 0,
        GENERATED_PARTLY = 10,
@@ -35,21 +41,11 @@ class MapChunk
 {
 public:
        MapChunk():
-               //m_is_volatile(true)
-               m_generation_level(GENERATED_NOT)
+               m_generation_level(GENERATED_NOT),
+               m_modified(true)
        {
        }
 
-       /*
-               If is_volatile is true, chunk can be modified when
-               neighboring chunks are generated.
-
-               It is set to false when all the 8 neighboring chunks have
-               been generated.
-       */
-       /*bool getIsVolatile(){ return m_is_volatile; }
-       void setIsVolatile(bool is){ m_is_volatile = is; }*/
-       
        /*
                Generation level. Possible values:
                GENERATED_FULLY = 0 = fully generated
@@ -59,10 +55,23 @@ public:
        u16 getGenLevel(){ return m_generation_level; }
        void setGenLevel(u16 lev){ m_generation_level = lev; }
 
+       void serialize(std::ostream &os, u8 version)
+       {
+               os.write((char*)&m_generation_level, 1);
+       }
+       void deSerialize(std::istream &is, u8 version)
+       {
+               is.read((char*)&m_generation_level, 1);
+       }
+
+       bool isModified(){ return m_modified; }
+       void setModified(bool modified){ m_modified = modified; }
+
 private:
-       //bool m_is_volatile;
-       u16 m_generation_level;
+       u8 m_generation_level;
+       bool m_modified;
 };
+#endif
 
 #endif