Merge remote-tracking branch 'darkrose/master'

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

diff --git a/src/environment.h b/src/environment.h
index f5cce59339ab01451f8655edf85aeb652f1d19ce..d9248d2adbb7d131b9edffe335be7911c60d5446 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:
@@ -159,7 +159,7 @@ public:
        void loadMeta(const std::string &savedir);
 
        /*
-               ActiveObjects
+               External ActiveObject interface
                -------------------------------------------
        */
 
@@ -198,13 +198,37 @@ public:
        ActiveObjectMessage getActiveObjectMessage();
 
        /*
-               ActiveBlockModifiers
+               Activate objects and dynamically modify for the dtime determined
+               from timestamp and additional_dtime
+       */
+       void activateBlock(MapBlock *block, u32 additional_dtime=0);
+
+       /*
+               ActiveBlockModifiers (TODO)
                -------------------------------------------
        */
 
        void addActiveBlockModifier(ActiveBlockModifier *abm);
 
 private:
+
+       /*
+               Internal ActiveObject interface
+               -------------------------------------------
+       */
+
+       /*
+               Add an active object to the environment.
+
+               Called by addActiveObject.
+
+               Object may be deleted by environment immediately.
+               If id of object is 0, assigns a free id to it.
+               Returns the id of the object.
+               Returns 0 if not added and thus deleted.
+       */
+       u16 addActiveObjectRaw(ServerActiveObject *object, bool set_changed);
+       
        /*
                Remove all objects that satisfy (m_removed && m_known_by_count==0)
        */
@@ -246,6 +270,7 @@ private:
        ActiveBlockList m_active_blocks;
        IntervalLimiter m_active_blocks_management_interval;
        IntervalLimiter m_active_blocks_test_interval;
+       IntervalLimiter m_active_blocks_nodemetadata_interval;
        // Time from the beginning of the game in seconds.
        // Incremented in step().
        u32 m_game_time;
@@ -381,12 +406,17 @@ public:
        
        // Get event from queue. CEE_NONE is returned if queue is empty.
        ClientEnvEvent getClientEvent();
+
+       // Post effects
+       void drawPostFx(video::IVideoDriver* driver, v3f camera_pos);
        
 private:
        ClientMap *m_map;
        scene::ISceneManager *m_smgr;
        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