Create framework for getting rid of global definitions of node/tool/item/whatever...

[dragonfireclient.git] / src / environment.h

diff --git a/src/environment.h b/src/environment.h
index eac69d222af38b49a7642632a2e8db04b9f7f6fc..754b63979657c727dbfa396e36c6bdd60af8d2cb 100644 (file)
--- a/src/environment.h
+++ b/src/environment.h
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        - The map
        - Players
        - Other objects
-       - The current time in the game (actually it only contains the brightness)
+       - The current time in the game
        - etc.
 */
 
@@ -36,6 +36,14 @@ 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;
+typedef struct lua_State lua_State;
+class ITextureSource;
+class IGameDef;
 
 class Environment
 {
@@ -118,34 +126,29 @@ class ActiveBlockList
        This is not thread-safe. Server uses an environment mutex.
 */
 
-#include "serverobject.h"
-
-class Server;
-class ActiveBlockModifier;
-
 class ServerEnvironment : public Environment
 {
 public:
-       ServerEnvironment(ServerMap *map, Server *server);
+       ServerEnvironment(ServerMap *map, lua_State *L, IGameDef *gamedef);
        ~ServerEnvironment();
 
        Map & getMap()
-       {
-               return *m_map;
-       }
+               { return *m_map; }
 
        ServerMap & getServerMap()
-       {
-               return *m_map;
-       }
+               { return *m_map; }
+
+       lua_State* getLua()
+               { return m_lua; }
 
-       Server * getServer()
+       IGameDef *getGameDef()
+               { return m_gamedef; }
+
+       float getSendRecommendedInterval()
        {
-               return m_server;
+               return 0.10;
        }
 
-       void step(f32 dtime);
-       
        /*
                Save players
        */
@@ -175,6 +178,14 @@ class ServerEnvironment : public Environment
        */
        u16 addActiveObject(ServerActiveObject *object);
        
+       /*
+               Add an active object as a static object to the corresponding
+               MapBlock.
+               Caller allocates memory, ServerEnvironment frees memory.
+               Return value: true if succeeded, false if failed.
+       */
+       bool addActiveObjectAsStatic(ServerActiveObject *object);
+       
        /*
                Find out what new objects have been added to
                inside a radius around a position
@@ -206,10 +217,18 @@ class ServerEnvironment : public Environment
        /*
                ActiveBlockModifiers (TODO)
                -------------------------------------------
+               NOTE: Not used currently (TODO: Use or remove)
        */
 
        void addActiveBlockModifier(ActiveBlockModifier *abm);
 
+       /* Other stuff */
+       
+       // Clear all objects, loading and going through every MapBlock
+       void clearAllObjects();
+       
+       void step(f32 dtime);
+       
 private:
 
        /*
@@ -256,8 +275,10 @@ class ServerEnvironment : public Environment
        
        // The map
        ServerMap *m_map;
-       // Pointer to server (which is handling this environment)
-       Server *m_server;
+       // Lua state
+       lua_State *m_lua;
+       // Game definition
+       IGameDef *m_gamedef;
        // Active object list
        core::map<u16, ServerActiveObject*> m_active_objects;
        // Outgoing network message buffer for active objects
@@ -283,6 +304,8 @@ class ServerEnvironment : public Environment
 
        These are fed into ServerEnvironment at initialization time;
        ServerEnvironment handles deleting them.
+
+       NOTE: Not used currently (TODO: Use or remove)
 */
 
 class ActiveBlockModifier
@@ -334,7 +357,8 @@ struct ClientEnvEvent
 class ClientEnvironment : public Environment
 {
 public:
-       ClientEnvironment(ClientMap *map, scene::ISceneManager *smgr);
+       ClientEnvironment(ClientMap *map, scene::ISceneManager *smgr,
+                       ITextureSource *texturesource, IGameDef *gamedef);
        ~ClientEnvironment();
 
        Map & getMap()
@@ -351,8 +375,9 @@ class ClientEnvironment : public Environment
 
        virtual void addPlayer(Player *player);
        LocalPlayer * getLocalPlayer();
-
-       void updateMeshes(v3s16 blockpos);
+       
+       // Slightly deprecated
+       void updateMeshes(v3s16 blockpos, ITextureSource *tsrc);
        void expireMeshes(bool only_daynight_diffed);
 
        void setTimeOfDay(u32 time)
@@ -363,8 +388,8 @@ class ClientEnvironment : public Environment
 
                if(getDayNightRatio() != old_dr)
                {
-                       dout_client<<DTIME<<"ClientEnvironment: DayNightRatio changed"
-                                       <<" -> expiring meshes"<<std::endl;
+                       /*infostream<<"ClientEnvironment: DayNightRatio changed"
+                                       <<" -> expiring meshes"<<std::endl;*/
                        expireMeshes(true);
                }
        }
@@ -410,8 +435,12 @@ class ClientEnvironment : public Environment
 private:
        ClientMap *m_map;
        scene::ISceneManager *m_smgr;
+       ITextureSource *m_texturesource;
+       IGameDef *m_gamedef;
        core::map<u16, ClientActiveObject*> m_active_objects;
        Queue<ClientEnvEvent> m_client_event_queue;
+       IntervalLimiter m_active_object_light_update_interval;
+       IntervalLimiter m_lava_hurt_interval;
 };
 
 #endif