From 01c2b003e1efb839ad246eb939af7fa8336b9ad5 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sun, 3 Apr 2011 16:21:06 +0300 Subject: commit before some more radical changes --- src/mapblock.h | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'src/mapblock.h') diff --git a/src/mapblock.h b/src/mapblock.h index 3614d1367..6af4070bc 100644 --- a/src/mapblock.h +++ b/src/mapblock.h @@ -31,6 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "constants.h" #include "mapblockobject.h" #include "voxel.h" +#include "nodemetadata.h" // Named by looking towards z+ enum{ @@ -619,6 +620,8 @@ public: JMutex mesh_mutex; #endif + NodeMetadataList m_node_metadata; + private: /* Private member variables @@ -665,27 +668,11 @@ private: // Whether day and night lighting differs bool m_day_night_differs; - /* - Whether everything that is mainly located on this block has - been added to the world. - - While this is false, a block can still be changed a bit when - stuff is added to the neighboring blocks that extends to this - one. - - When this is false on every one of a 3x3x3 chunk of blocks, the - central one will not be changed by the map generator in the - future. - - TODO: Save in file - */ - //bool m_not_fully_generated; - MapBlockObjectList m_objects; // Object spawning stuff float m_spawn_timer; - + #ifndef SERVER // Only on client /* Set to true if the mesh has been ordered to be updated -- cgit v1.2.3