added dedicated server build without irrlicht

[minetest.git] / src / server.h

diff --git a/src/server.h b/src/server.h
index 851a5ba67ab7e7e2c5a2f0cf4f3817f1a446ba2e..c20189eb106003f8e703fce2b6e2c92e4a281fab 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "environment.h"
 #include "common_irrlicht.h"
 #include <string>
+#include "utility.h"
 
 #ifdef _WIN32
        #include <windows.h>
@@ -146,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
@@ -281,6 +244,7 @@ class RemoteClient
                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();
@@ -384,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.
@@ -467,6 +432,12 @@ class Server : public con::PeerHandler
        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;