Better spawn position finding and checking

[dragonfireclient.git] / src / server.h

diff --git a/src/server.h b/src/server.h
index df2d38e65a220cebd77060cbc9949877644e0c8e..b238bec26e86029b191c03101ce776808d4fb6f0 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -24,7 +24,6 @@ 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"
@@ -450,28 +449,33 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        }
        
        // 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);
 
 private:
 
@@ -488,6 +492,8 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        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 +532,9 @@ class Server : public con::PeerHandler, public MapEventReceiver,
                Something random
        */
        
+       void HandlePlayerHP(Player *player, s16 damage);
+       void RespawnPlayer(Player *player);
+       
        void UpdateCrafting(u16 peer_id);
        
        // When called, connection mutex should be locked