fixed problem with vc++ build crashing at startup

[dragonfireclient.git] / src / environment.h

diff --git a/src/environment.h b/src/environment.h
index b4159372ac691d39b1428dbdbd46ac50efd727f6..e82cea6ae275ab9fe2330b543397b8bfa4431a60 100644 (file)
--- a/src/environment.h
+++ b/src/environment.h
@@ -35,6 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "player.h"
 #include "map.h"
 #include <ostream>
+#include "utility.h"
 
 class Environment
 {
@@ -153,6 +154,8 @@ class ServerEnvironment : public Environment
        core::map<u16, ServerActiveObject*> m_active_objects;
        Queue<ActiveObjectMessage> m_active_object_messages;
        float m_random_spawn_timer;
+       float m_send_recommended_timer;
+       IntervalLimiter m_object_management_interval;
 };
 
 #ifndef SERVER
@@ -211,7 +214,11 @@ class ClientEnvironment : public Environment
        void removeActiveObject(u16 id);
 
        void processActiveObjectMessage(u16 id, const std::string &data);
-
+       
+       // Get all nearby objects
+       void getActiveObjects(v3f origin, f32 max_d,
+                       core::array<DistanceSortedActiveObject> &dest);
+       
 private:
        ClientMap *m_map;
        scene::ISceneManager *m_smgr;