ToolDefManager serialization

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

diff --git a/src/server.h b/src/server.h
index ab8c31a00a0a57186692d91eba573269d64874c1..e1a5838260815cd9c1d782df870f660f1c5e7e1e 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -29,8 +29,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "inventory.h"
 #include "auth.h"
 #include "ban.h"
+#include "gamedef.h"
 struct LuaState;
 typedef struct lua_State lua_State;
+class IWritableToolDefManager;
+class IWritableNodeDefManager;
 
 /*
        Some random functions
@@ -361,7 +364,7 @@ private:
 };
 
 class Server : public con::PeerHandler, public MapEventReceiver,
-               public InventoryManager
+               public InventoryManager, public IGameDef
 {
 public:
        /*
@@ -481,6 +484,12 @@ public:
        
        // 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 ITextureSource* getTextureSource();
 
 private:
 
@@ -605,6 +614,12 @@ private:
        // 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_nodemgr;
        
        /*
                Threads
@@ -692,8 +707,6 @@ private:
        */
        u16 m_ignore_map_edit_events_peer_id;
 
-       Profiler *m_profiler;
-
        friend class EmergeThread;
        friend class RemoteClient;
 };