some tweaking

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

diff --git a/src/server.h b/src/server.h
index c5a285490aa34e20ea21995ab72c1bb4fdbc48b7..fcc37631fb62b9f9e773009bceabedcafe4f341a 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -29,14 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "common_irrlicht.h"
 #include <string>
 #include "utility.h"
-
-#ifdef _WIN32
-       #include <windows.h>
-       #define sleep_ms(x) Sleep(x)
-#else
-       #include <unistd.h>
-       #define sleep_ms(x) usleep(x*1000)
-#endif
+#include "porting.h"
 
 struct QueuedBlockEmerge
 {
@@ -238,7 +231,8 @@ public:
        u8 pending_serialization_version;
 
        RemoteClient():
-               m_time_from_building(9999)
+               m_time_from_building(9999),
+               m_excess_gotblocks(0)
        {
                peer_id = 0;
                serialization_version = SER_FMT_VER_INVALID;
@@ -249,9 +243,9 @@ public:
                m_blocks_sent_mutex.Init();
                m_blocks_sending_mutex.Init();
                
-               m_dig_mutex.Init();
+               /*m_dig_mutex.Init();
                m_dig_time_remaining = 0;
-               m_dig_tool_item = -1;
+               m_dig_tool_item = -1;*/
        }
        ~RemoteClient()
        {
@@ -302,17 +296,19 @@ public:
                                <<", m_blocks_sent.size()="<<m_blocks_sent.size()
                                <<", m_blocks_sending.size()="<<m_blocks_sending.size()
                                <<", m_nearest_unsent_d="<<m_nearest_unsent_d
+                               <<", m_excess_gotblocks="<<m_excess_gotblocks
                                <<std::endl;
+               m_excess_gotblocks = 0;
        }
 
        // Time from last placing or removing blocks
        MutexedVariable<float> m_time_from_building;
        
-       JMutex m_dig_mutex;
+       /*JMutex m_dig_mutex;
        float m_dig_time_remaining;
        // -1 = not digging
        s16 m_dig_tool_item;
-       v3s16 m_dig_position;
+       v3s16 m_dig_position;*/
 
 private:
        /*
@@ -354,6 +350,15 @@ private:
        */
        core::map<v3s16, float> m_blocks_sending;
        JMutex m_blocks_sending_mutex;
+
+       /*
+               Count of excess GotBlocks().
+               There is an excess amount because the client sometimes
+               gets a block so late that the server sends it again,
+               and the client then sends two GOTBLOCKs.
+               This is resetted by PrintInfo()
+       */
+       u32 m_excess_gotblocks;
 };
 
 /*struct ServerSettings
@@ -392,7 +397,6 @@ public:
 
        // Environment and Connection must be locked when called
        void SendBlockNoLock(u16 peer_id, MapBlock *block, u8 ver);
-       //TODO: Sending of many blocks in a single packet
        
        // Environment and Connection must be locked when called
        //void SendSectorMeta(u16 peer_id, core::list<v2s16> ps, u8 ver);
@@ -415,7 +419,6 @@ private:
 
        // Virtual methods from con::PeerHandler.
        // As of now, these create and remove clients and players.
-       // TODO: Make it possible to leave players on server.
        void peerAdded(con::Peer *peer);
        void deletingPeer(con::Peer *peer, bool timeout);
        
@@ -423,22 +426,40 @@ private:
        void SendObjectData(float dtime);
        void SendPlayerInfos();
        void SendInventory(u16 peer_id);
+       void SendChatMessage(u16 peer_id, const std::wstring &message);
+       void BroadcastChatMessage(const std::wstring &message);
+       
        // Sends blocks to clients
        void SendBlocks(float dtime);
        
        // When called, connection mutex should be locked
        RemoteClient* getClient(u16 peer_id);
 
+       /*
+               Get a player from memory or creates one.
+               If player is already connected, return NULL
+
+               Call with env and con locked.
+       */
+       Player *emergePlayer(const char *name, const char *password,
+                       u16 peer_id);
+
        /*
                Update water pressure.
                This also adds suitable nodes to active_nodes.
 
                environment has to be locked when calling.
        */
-       void UpdateBlockWaterPressure(MapBlock *block,
-                       core::map<v3s16, MapBlock*> &modified_blocks);
+       /*void UpdateBlockWaterPressure(MapBlock *block,
+                       core::map<v3s16, MapBlock*> &modified_blocks);*/
+       
+       // Locks environment and connection by its own
+       struct PeerChange;
+       void handlePeerChange(PeerChange &c);
+       void handlePeerChanges();
        
-       float m_flowwater_timer;
+       //float m_flowwater_timer;
+       float m_liquid_transform_timer;
        float m_print_info_timer;
        float m_objectdata_timer;
        float m_emergethread_trigger_timer;
@@ -462,7 +483,7 @@ private:
        BlockEmergeQueue m_emerge_queue;
        
        // Nodes that are destinations of flowing liquid at the moment
-       core::map<v3s16, u8> m_flow_active_nodes;
+       //core::map<v3s16, u8> m_flow_active_nodes;
 
        // 0-23999
        MutexedVariable<u32> m_time_of_day;
@@ -470,9 +491,33 @@ private:
        float m_time_counter;
        float m_time_of_day_send_timer;
        
+       MutexedVariable<double> m_uptime;
+
+       enum PeerChangeType
+       {
+               PEER_ADDED,
+               PEER_REMOVED
+       };
+
+       struct PeerChange
+       {
+               PeerChangeType type;
+               u16 peer_id;
+               bool timeout;
+       };
+       
+       Queue<PeerChange> m_peer_change_queue;
+
+       std::string m_mapsavedir;
+
        friend class EmergeThread;
        friend class RemoteClient;
 };
 
+/*
+       Runs a simple dedicated server loop
+*/
+void dedicated_server_loop(Server &server);
+
 #endif