summaryrefslogtreecommitdiff
path: root/src/mapchunk.h
diff options
context:
space:
mode:
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-14 22:43:22 +0200
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-14 22:43:28 +0200
commitaf05e4b2defde537f3b953a7dae0ef44fae225aa (patch)
tree3f751014432b35df1cc2fd6fb976410e86b70e73 /src/mapchunk.h
parent4415d95c503f083d871abaf84516f2b6487ecb60 (diff)
parent81535f6277b66c869cda7125b2aeaf99e8078b92 (diff)
downloadminetest-af05e4b2defde537f3b953a7dae0ef44fae225aa.tar.gz
minetest-af05e4b2defde537f3b953a7dae0ef44fae225aa.tar.bz2
minetest-af05e4b2defde537f3b953a7dae0ef44fae225aa.zip
Merge branch 'upstream/master'
Conflicts: data/oerkki1.png src/client.cpp
Diffstat (limited to 'src/mapchunk.h')
-rw-r--r--src/mapchunk.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mapchunk.h b/src/mapchunk.h
index 9860abad0..98df7ce66 100644
--- a/src/mapchunk.h
+++ b/src/mapchunk.h
@@ -21,6 +21,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define MAPCHUNK_HEADER
/*
+ TODO: Remove
+*/
+
+#if 0
+/*
MapChunk contains map-generation-time metadata for an area of
some MapSectors. (something like 16x16)
*/
@@ -66,6 +71,7 @@ private:
u8 m_generation_level;
bool m_modified;
};
+#endif
#endif