reorganized a lot of stuff and modified mapgen and objects slightly while doing it

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

diff --git a/src/environment.h b/src/environment.h
index eac69d222af38b49a7642632a2e8db04b9f7f6fc..ce6b5ae1e76bb1c6912f99198b259ea2c8746789 100644 (file)
--- a/src/environment.h
+++ b/src/environment.h
@@ -36,6 +36,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "map.h"
 #include <ostream>
 #include "utility.h"
+#include "activeobject.h"
+
+class Server;
+class ActiveBlockModifier;
+class ServerActiveObject;
 
 class Environment
 {
@@ -118,11 +123,6 @@ private:
        This is not thread-safe. Server uses an environment mutex.
 */
 
-#include "serverobject.h"
-
-class Server;
-class ActiveBlockModifier;
-
 class ServerEnvironment : public Environment
 {
 public:
@@ -412,6 +412,7 @@ private:
        scene::ISceneManager *m_smgr;
        core::map<u16, ClientActiveObject*> m_active_objects;
        Queue<ClientEnvEvent> m_client_event_queue;
+       IntervalLimiter m_active_object_light_update_interval;
 };
 
 #endif