Move tool stuff to tool.{h,cpp}

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

diff --git a/src/environment.h b/src/environment.h
index 055e2b1f68c0fc5ab78e4082ffab09e779c3f5ae..7a4cc37777eec591a107ce99571cd171bf51c2e6 100644 (file)
--- a/src/environment.h
+++ b/src/environment.h
@@ -41,6 +41,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class Server;
 class ActiveBlockModifier;
 class ServerActiveObject;
+typedef struct lua_State lua_State;
 
 class Environment
 {
@@ -126,7 +127,7 @@ private:
 class ServerEnvironment : public Environment
 {
 public:
-       ServerEnvironment(ServerMap *map, Server *server);
+       ServerEnvironment(ServerMap *map, lua_State *L);
        ~ServerEnvironment();
 
        Map & getMap()
@@ -139,13 +140,16 @@ public:
                return *m_map;
        }
 
-       Server * getServer()
+       lua_State* getLua()
        {
-               return m_server;
+               return m_lua;
+       }
+
+       float getSendRecommendedInterval()
+       {
+               return 0.10;
        }
 
-       void step(f32 dtime);
-       
        /*
                Save players
        */
@@ -175,6 +179,14 @@ public:
        */
        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
@@ -210,6 +222,13 @@ public:
 
        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,8 @@ private:
        
        // The map
        ServerMap *m_map;
-       // Pointer to server (which is handling this environment)
-       Server *m_server;
+       // Lua state
+       lua_State *m_lua;
        // Active object list
        core::map<u16, ServerActiveObject*> m_active_objects;
        // Outgoing network message buffer for active objects