added dedicated server build without irrlicht

[minetest.git] / src / server.h

diff --git a/src/server.h b/src/server.h
index 9c5850bff69bd1c19281d7743ef8aac810895fb8..c20189eb106003f8e703fce2b6e2c92e4a281fab 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -1,3 +1,22 @@
+/*
+Minetest-c55
+Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
 /*
 (c) 2010 Perttu Ahola <celeron55@gmail.com>
 */
@@ -9,6 +28,7 @@
 #include "environment.h"
 #include "common_irrlicht.h"
 #include <string>
+#include "utility.h"
 
 #ifdef _WIN32
        #include <windows.h>
@@ -127,44 +147,6 @@ class BlockEmergeQueue
        JMutex m_mutex;
 };
 
-class SimpleThread : public JThread
-{
-       bool run;
-       JMutex run_mutex;
-
-public:
-
-       SimpleThread():
-               JThread(),
-               run(true)
-       {
-               run_mutex.Init();
-       }
-
-       virtual ~SimpleThread()
-       {}
-
-       virtual void * Thread() = 0;
-
-       bool getRun()
-       {
-               JMutexAutoLock lock(run_mutex);
-               return run;
-       }
-       void setRun(bool a_run)
-       {
-               JMutexAutoLock lock(run_mutex);
-               run = a_run;
-       }
-
-       void stop()
-       {
-               setRun(false);
-               while(IsRunning())
-                       sleep_ms(100);
-       }
-};
-
 class Server;
 
 class ServerThread : public SimpleThread
@@ -256,16 +238,20 @@ class RemoteClient
        u8 pending_serialization_version;
 
        RemoteClient():
-               m_time_from_building(0.0)
-               //m_num_blocks_in_emerge_queue(0)
+               m_time_from_building(9999)
        {
                peer_id = 0;
                serialization_version = SER_FMT_VER_INVALID;
                pending_serialization_version = SER_FMT_VER_INVALID;
                m_nearest_unsent_d = 0;
+               m_nearest_unsent_reset_timer = 0.0;
 
                m_blocks_sent_mutex.Init();
                m_blocks_sending_mutex.Init();
+               
+               m_dig_mutex.Init();
+               m_dig_time_remaining = 0;
+               m_dig_tool_item = -1;
        }
        ~RemoteClient()
        {
@@ -319,8 +305,6 @@ class RemoteClient
                JMutexAutoLock l2(m_blocks_sent_mutex);
                JMutexAutoLock l3(m_blocks_sending_mutex);
                o<<"RemoteClient "<<peer_id<<": "
-                               /*<<"m_num_blocks_in_emerge_queue="
-                               <<m_num_blocks_in_emerge_queue.get()*/
                                <<", m_blocks_sent.size()="<<m_blocks_sent.size()
                                <<", m_blocks_sending.size()="<<m_blocks_sending.size()
                                <<", m_nearest_unsent_d="<<m_nearest_unsent_d
@@ -330,6 +314,12 @@ class RemoteClient
        // Time from last placing or removing blocks
        MutexedVariable<float> m_time_from_building;
        
+       JMutex m_dig_mutex;
+       float m_dig_time_remaining;
+       // -1 = not digging
+       s16 m_dig_tool_item;
+       v3s16 m_dig_position;
+
 private:
        /*
                All members that are accessed by many threads should
@@ -358,6 +348,7 @@ class RemoteClient
        core::map<v3s16, bool> m_blocks_sent;
        s16 m_nearest_unsent_d;
        v3s16 m_last_center;
+       float m_nearest_unsent_reset_timer;
        JMutex m_blocks_sent_mutex;
        /*
                Blocks that are currently on the line.
@@ -431,10 +422,24 @@ class Server : public con::PeerHandler
        
        // When called, connection mutex should be locked
        RemoteClient* getClient(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);
+       
+       float m_flowwater_timer;
+       float m_print_info_timer;
+       float m_objectdata_timer;
+       float m_emergethread_trigger_timer;
+       float m_savemap_timer;
        
        // NOTE: If connection and environment are both to be locked,
        // environment shall be locked first.
-
        JMutex m_env_mutex;
        Environment m_env;
 
@@ -450,6 +455,9 @@ class Server : public con::PeerHandler
 
        BlockEmergeQueue m_emerge_queue;
        
+       // Nodes that are destinations of flowing liquid at the moment
+       core::map<v3s16, u8> m_flow_active_nodes;
+       
        friend class EmergeThread;
        friend class RemoteClient;
 };