ToolDefManager serialization

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

diff --git a/src/server.h b/src/server.h
index df2d38e65a220cebd77060cbc9949877644e0c8e..e1a5838260815cd9c1d782df870f660f1c5e7e1e 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -24,12 +24,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "environment.h"
 #include "common_irrlicht.h"
 #include <string>
-#include "utility.h"
 #include "porting.h"
 #include "map.h"
 #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
@@ -360,7 +364,7 @@ private:
 };
 
 class Server : public con::PeerHandler, public MapEventReceiver,
-               public InventoryManager
+               public InventoryManager, public IGameDef
 {
 public:
        /*
@@ -392,7 +396,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;
        }
 
@@ -450,28 +454,42 @@ public:
        }
        
        // Saves g_settings to configpath given at initialization
-       void saveConfig()
+       void saveConfig();
+
+       void setIpBanned(const std::string &ip, const std::string &name)
        {
-               if(m_configpath != "")
-                       g_settings.updateConfigFile(m_configpath.c_str());
+               m_banmanager.add(ip, name);
+               return;
        }
 
-       void setIpBanned(std::string ip)
+       void unsetIpBanned(const std::string &ip_or_name)
        {
-               m_banmanager.add(ip);
+               m_banmanager.remove(ip_or_name);
                return;
        }
 
-       void unsetIpBanned(std::string ip)
+       std::string getBanDescription(const std::string &ip_or_name)
        {
-               m_banmanager.remove(ip);
-               return;
+               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 ITextureSource* getTextureSource();
 
 private:
 
@@ -488,6 +506,8 @@ private:
        static void SendHP(con::Connection &con, u16 peer_id, u8 hp);
        static void SendAccessDenied(con::Connection &con, u16 peer_id,
                        const std::wstring &reason);
+       static void SendDeathscreen(con::Connection &con, u16 peer_id,
+                       bool set_camera_point_target, v3f camera_point_target);
        
        /*
                Non-static send methods
@@ -526,6 +546,9 @@ private:
                Something random
        */
        
+       void HandlePlayerHP(Player *player, s16 damage);
+       void RespawnPlayer(Player *player);
+       
        void UpdateCrafting(u16 peer_id);
        
        // When called, connection mutex should be locked
@@ -534,7 +557,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();
@@ -573,7 +596,7 @@ private:
        // environment shall be locked first.
 
        // Environment
-       ServerEnvironment m_env;
+       ServerEnvironment *m_env;
        JMutex m_env_mutex;
        
        // Connection
@@ -587,6 +610,16 @@ 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_nodemgr;
        
        /*
                Threads
@@ -674,8 +707,6 @@ private:
        */
        u16 m_ignore_map_edit_events_peer_id;
 
-       Profiler *m_profiler;
-
        friend class EmergeThread;
        friend class RemoteClient;
 };