Falling sand and gravel

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

diff --git a/src/server.h b/src/server.h
index dac7e2826314b9ccd17e26cbe13081223141952c..7620f5341bb291c4fa8fb1a9e24953d71d3765ac 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -29,6 +29,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "inventory.h"
 #include "auth.h"
 #include "ban.h"
+#include "gamedef.h"
+#include "serialization.h" // For SER_FMT_VER_INVALID
+struct LuaState;
+typedef struct lua_State lua_State;
+class IWritableToolDefManager;
+class IWritableNodeDefManager;
+class IWritableCraftDefManager;
 
 /*
        Some random functions
@@ -359,7 +366,7 @@ private:
 };
 
 class Server : public con::PeerHandler, public MapEventReceiver,
-               public InventoryManager
+               public InventoryManager, public IGameDef
 {
 public:
        /*
@@ -391,7 +398,7 @@ public:
        // Environment must be locked when called
        void setTimeOfDay(u32 time)
        {
-               m_env.setTimeOfDay(time);
+               m_env->setTimeOfDay(time);
                m_time_of_day_send_timer = 0;
        }
 
@@ -468,14 +475,29 @@ public:
                return m_banmanager.getBanDescription(ip_or_name);
        }
 
-       con::Peer* getPeerNoEx(u16 peer_id)
+       Address getPeerAddress(u16 peer_id)
        {
-               return m_con.GetPeerNoEx(peer_id);
+               return m_con.GetPeerAddress(peer_id);
        }
        
        // Envlock and conlock should be locked when calling this
        void notifyPlayer(const char *name, const std::wstring msg);
        void notifyPlayers(const std::wstring msg);
+       
+       // Envlock and conlock should be locked when using Lua
+       lua_State *getLua(){ return m_lua; }
+       
+       // IGameDef interface
+       // Under envlock
+       virtual IToolDefManager* getToolDefManager();
+       virtual INodeDefManager* getNodeDefManager();
+       virtual ICraftDefManager* getCraftDefManager();
+       virtual ITextureSource* getTextureSource();
+       virtual u16 allocateUnknownNodeId(const std::string &name);
+       
+       IWritableToolDefManager* getWritableToolDefManager();
+       IWritableNodeDefManager* getWritableNodeDefManager();
+       IWritableCraftDefManager* getWritableCraftDefManager();
 
 private:
 
@@ -494,9 +516,16 @@ private:
                        const std::wstring &reason);
        static void SendDeathscreen(con::Connection &con, u16 peer_id,
                        bool set_camera_point_target, v3f camera_point_target);
+       static void SendToolDef(con::Connection &con, u16 peer_id,
+                       IToolDefManager *tooldef);
+       static void SendNodeDef(con::Connection &con, u16 peer_id,
+                       INodeDefManager *nodedef);
        
        /*
-               Non-static send methods
+               Non-static send methods.
+               Conlock should be always used.
+               Envlock usage is documented badly but it's easy to figure out
+               which ones access the environment.
        */
 
        // Envlock and conlock should be locked when calling these
@@ -527,6 +556,8 @@ private:
        
        // Sends blocks to clients (locks env and con on its own)
        void SendBlocks(float dtime);
+       
+       void SendTextures(u16 peer_id);
 
        /*
                Something random
@@ -543,7 +574,7 @@ private:
        // When called, environment mutex should be locked
        std::string getPlayerName(u16 peer_id)
        {
-               Player *player = m_env.getPlayer(peer_id);
+               Player *player = m_env->getPlayer(peer_id);
                if(player == NULL)
                        return "[id="+itos(peer_id);
                return player->getName();
@@ -582,7 +613,7 @@ private:
        // environment shall be locked first.
 
        // Environment
-       ServerEnvironment m_env;
+       ServerEnvironment *m_env;
        JMutex m_env_mutex;
        
        // Connection
@@ -596,6 +627,19 @@ private:
 
        // Bann checking
        BanManager m_banmanager;
+
+       // Scripting
+       // Envlock and conlock should be locked when using Lua
+       lua_State *m_lua;
+
+       // Tool definition manager
+       IWritableToolDefManager *m_toolmgr;
+       
+       // Node definition manager
+       IWritableNodeDefManager *m_nodedef;
+       
+       // Craft definition manager
+       IWritableCraftDefManager *m_craftdef;
        
        /*
                Threads
@@ -653,6 +697,9 @@ private:
 
        // Configuration path ("" = no configuration file)
        std::string m_configpath;
+       
+       // Mod parent directory paths
+       core::list<std::string> m_modspaths;
 
        bool m_shutdown_requested;
        
@@ -683,8 +730,6 @@ private:
        */
        u16 m_ignore_map_edit_events_peer_id;
 
-       Profiler *m_profiler;
-
        friend class EmergeThread;
        friend class RemoteClient;
 };