Replace stray tab with whitespace in guiFormSpecMenu.cpp (#9317)

[dragonfireclient.git] / src / server.h

diff --git a/src/server.h b/src/server.h
index 06adbad689beb40115b7a87ddf2b4ab5760d67c5..d61840871b933d6afa9b1cf84f45d4be52f58909 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -189,13 +189,13 @@ class Server : public con::PeerHandler, public MapEventReceiver,
                This is accessed by the map, which is inside the environment,
                so it shouldn't be a problem.
        */
-       void onMapEditEvent(MapEditEvent *event);
+       void onMapEditEvent(const MapEditEvent &event);
 
        /*
                Shall be called with the environment and the connection locked.
        */
        Inventory* getInventory(const InventoryLocation &loc);
-       void setInventoryModified(const InventoryLocation &loc, bool playerSend = true);
+       void setInventoryModified(const InventoryLocation &loc);
 
        // Connection must be locked when called
        std::wstring getStatusString();
@@ -333,9 +333,12 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 
        void SendPlayerHPOrDie(PlayerSAO *player, const PlayerHPChangeReason &reason);
        void SendPlayerBreath(PlayerSAO *sao);
-       void SendInventory(PlayerSAO* playerSAO);
+       void SendInventory(PlayerSAO *playerSAO, bool incremental);
        void SendMovePlayer(session_t peer_id);
        void SendPlayerSpeed(session_t peer_id, const v3f &added_vel);
+       void SendPlayerFov(session_t peer_id);
+
+       void sendDetachedInventories(session_t peer_id, bool incremental);
 
        virtual bool registerModStorage(ModMetadata *storage);
        virtual void unregisterModStorage(const std::string &name);
@@ -443,7 +446,6 @@ class Server : public con::PeerHandler, public MapEventReceiver,
                        const std::vector<std::string> &tosend);
 
        void sendDetachedInventory(const std::string &name, session_t peer_id);
-       void sendDetachedInventories(session_t peer_id);
 
        // Adds a ParticleSpawner on peer with peer_id (PEER_ID_INEXISTENT == all)
        void SendAddParticleSpawner(session_t peer_id, u16 protocol_version,
@@ -468,7 +470,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
                bool vertical, const std::string &texture,
                const struct TileAnimationParams &animation, u8 glow);
 
-       u32 SendActiveObjectRemoveAdd(session_t peer_id, const std::string &datas);
+       void SendActiveObjectRemoveAdd(RemoteClient *client, PlayerSAO *playersao);
        void SendActiveObjectMessages(session_t peer_id, const std::string &datas,
                bool reliable = true);
        void SendCSMRestrictionFlags(session_t peer_id);
@@ -514,7 +516,6 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        /*
                Variables
        */
-
        // World directory
        std::string m_path_world;
        // Subgame specification
@@ -574,7 +575,6 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        /*
                Threads
        */
-
        // A buffer for time steps
        // step() increments and AsyncRunStep() run by m_thread reads it.
        float m_step_dtime = 0.0f;
@@ -589,14 +589,14 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        /*
                Time related stuff
        */
-
        // Timer for sending time of day over network
        float m_time_of_day_send_timer = 0.0f;
        // Uptime of server in seconds
        MutexedVariable<double> m_uptime;
+
        /*
-        Client interface
-        */
+               Client interface
+       */
        ClientInterface m_clients;
 
        /*