X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmapblock.h;h=30e9e38f81e9cc9285995a51012ec4304e51d70e;hb=96e09703ba461923c2d8ffa3aeed8c6d0169b13f;hp=a77bf40c06c794c4b7cfc49da7f431e84bca6735;hpb=a9f89fb3fb72a57828ebceaeb4b469a005c11541;p=dragonfireclient.git

diff --git a/src/mapblock.h b/src/mapblock.h
index a77bf40c0..30e9e38f8 100644
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapblockobject.h"
 #include "voxel.h"
 #include "nodemetadata.h"
+#include "staticobject.h"
 
 
 // Named by looking towards z+
@@ -681,6 +682,7 @@ class MapBlock : public NodeContainer
 #endif
 	
 	NodeMetadataList m_node_metadata;
+	StaticObjectList m_static_objects;
 	
 private:
 	/*
@@ -727,10 +729,11 @@ class MapBlock : public NodeContainer
 	// Whether day and night lighting differs
 	bool m_day_night_differs;
 	
+	// TODO: Remove this
 	MapBlockObjectList m_objects;
 
 	// Object spawning stuff
-	float m_spawn_timer;
+	//float m_spawn_timer;
 
 #ifndef SERVER // Only on client
 	/*