Performance Improvement: Use a cache which caches result for getFacePositions.

[minetest.git] / src / server.h

diff --git a/src/server.h b/src/server.h
index ab89fbc6e165d69fdf9374672c5578b18a92a4eb..fa9f9ebcf491e1066bbb7058cc2fabd2fc261116 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef SERVER_HEADER
 #define SERVER_HEADER
 
-#include "connection.h"
+#include "network/connection.h"
 #include "irr_v3d.h"
 #include "map.h"
 #include "hud.h"
@@ -29,11 +29,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mods.h"
 #include "inventorymanager.h"
 #include "subgame.h"
-#include "rollback_interface.h" // Needed for rollbackRevertActions()
 #include "util/numeric.h"
 #include "util/thread.h"
 #include "environment.h"
 #include "clientiface.h"
+#include "network/networkpacket.h"
 #include <string>
 #include <list>
 #include <map>
@@ -50,6 +50,7 @@ class Inventory;
 class Player;
 class PlayerSAO;
 class IRollbackManager;
+struct RollbackAction;
 class EmergeManager;
 class GameScripting;
 class ServerEnvironment;
@@ -187,8 +188,39 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void AsyncRunStep(bool initial_step=false);
        void Receive();
        PlayerSAO* StageTwoClientInit(u16 peer_id);
+
+       /*
+        * Command Handlers
+        */
+
+       void handleCommand(NetworkPacket* pkt);
+
+       void handleCommand_Null(NetworkPacket* pkt) {};
+       void handleCommand_Deprecated(NetworkPacket* pkt);
+       void handleCommand_Init(NetworkPacket* pkt);
+       void handleCommand_Init2(NetworkPacket* pkt);
+       void handleCommand_RequestMedia(NetworkPacket* pkt);
+       void handleCommand_ReceivedMedia(NetworkPacket* pkt);
+       void handleCommand_ClientReady(NetworkPacket* pkt);
+       void handleCommand_GotBlocks(NetworkPacket* pkt);
+       void handleCommand_PlayerPos(NetworkPacket* pkt);
+       void handleCommand_DeletedBlocks(NetworkPacket* pkt);
+       void handleCommand_InventoryAction(NetworkPacket* pkt);
+       void handleCommand_ChatMessage(NetworkPacket* pkt);
+       void handleCommand_Damage(NetworkPacket* pkt);
+       void handleCommand_Breath(NetworkPacket* pkt);
+       void handleCommand_Password(NetworkPacket* pkt);
+       void handleCommand_PlayerItem(NetworkPacket* pkt);
+       void handleCommand_Respawn(NetworkPacket* pkt);
+       void handleCommand_Interact(NetworkPacket* pkt);
+       void handleCommand_RemovedSounds(NetworkPacket* pkt);
+       void handleCommand_NodeMetaFields(NetworkPacket* pkt);
+       void handleCommand_InventoryFields(NetworkPacket* pkt);
+
        void ProcessData(u8 *data, u32 datasize, u16 peer_id);
 
+       void Send(NetworkPacket* pkt);
+
        // Environment must be locked when called
        void setTimeOfDay(u32 time);
 
@@ -268,9 +300,6 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        // Envlock and conlock should be locked when using scriptapi
        GameScripting *getScriptIface(){ return m_script; }
 
-       // Envlock should be locked when using the rollback manager
-       IRollbackManager *getRollbackManager(){ return m_rollback; }
-
        //TODO: determine what (if anything) should be locked to access EmergeManager
        EmergeManager *getEmergeManager(){ return m_emerge; }
 
@@ -289,7 +318,9 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        virtual u16 allocateUnknownNodeId(const std::string &name);
        virtual ISoundManager* getSoundManager();
        virtual MtEventManager* getEventManager();
-       virtual IRollbackReportSink* getRollbackReportSink();
+       virtual scene::ISceneManager* getSceneManager();
+       virtual IRollbackManager *getRollbackManager() { return m_rollback; }
+
 
        IWritableItemDefManager* getWritableItemDefManager();
        IWritableNodeDefManager* getWritableNodeDefManager();
@@ -310,7 +341,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        bool showFormspec(const char *name, const std::string &formspec, const std::string &formname);
        Map & getMap() { return m_env->getMap(); }
        ServerEnvironment & getEnv() { return *m_env; }
-       
+
        u32 hudAdd(Player *player, HudElement *element);
        bool hudRemove(Player *player, u32 id);
        bool hudChange(Player *player, u32 id, HudElementStat stat, void *value);
@@ -321,10 +352,13 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 
        inline Address getPeerAddress(u16 peer_id)
                        { return m_con.GetPeerAddress(peer_id); }
-                       
+
+       bool setLocalPlayerAnimations(Player *player, v2s32 animation_frames[4], f32 frame_speed);
+       bool setPlayerEyeOffset(Player *player, v3f first, v3f third);
+
        bool setSky(Player *player, const video::SColor &bgcolor,
                        const std::string &type, const std::vector<std::string> &params);
-       
+
        bool overrideDayNightRatio(Player *player, bool do_override,
                        float brightness);
 
@@ -338,6 +372,9 @@ class Server : public con::PeerHandler, public MapEventReceiver,
                        u8* ser_vers, u16* prot_vers, u8* major, u8* minor, u8* patch,
                        std::string* vers_string);
 
+       // Bind address
+       Address m_bind_addr;
+
 private:
 
        friend class EmergeThread;
@@ -361,6 +398,8 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void SendPlayerHP(u16 peer_id);
        void SendPlayerBreath(u16 peer_id);
        void SendMovePlayer(u16 peer_id);
+       void SendLocalPlayerAnimations(u16 peer_id, v2s32 animation_frames[4], f32 animation_speed);
+       void SendEyeOffset(u16 peer_id, v3f first, v3f third);
        void SendPlayerPrivileges(u16 peer_id);
        void SendPlayerInventoryFormspec(u16 peer_id);
        void SendShowFormspecMessage(u16 peer_id, const std::string &formspec, const std::string &formname);
@@ -372,7 +411,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void SendSetSky(u16 peer_id, const video::SColor &bgcolor,
                        const std::string &type, const std::vector<std::string> &params);
        void SendOverrideDayNightRatio(u16 peer_id, bool do_override, float ratio);
-       
+
        /*
                Send a node removal/addition event to all clients except ignore_id.
                Additionally, if far_players!=NULL, players further away than
@@ -427,8 +466,8 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void UpdateCrafting(u16 peer_id);
 
        // When called, connection mutex should be locked
-       RemoteClient* getClient(u16 peer_id,ClientState state_min=Active);
-       RemoteClient* getClientNoEx(u16 peer_id,ClientState state_min=Active);
+       RemoteClient* getClient(u16 peer_id,ClientState state_min=CS_Active);
+       RemoteClient* getClientNoEx(u16 peer_id,ClientState state_min=CS_Active);
 
        // When called, environment mutex should be locked
        std::string getPlayerName(u16 peer_id);
@@ -482,7 +521,6 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 
        // Rollback manager (behind m_env_mutex)
        IRollbackManager *m_rollback;
-       bool m_rollback_sink_enabled;
        bool m_enable_rollback_recording; // Updated once in a while
 
        // Emerge manager