Use std::queue for HTTPFetchRequest and std::vector for log_output instead of std...

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

diff --git a/src/server.h b/src/server.h
index 2fea0db4ccef9c603373a35822bcd58118e7e8e0..ba6c37faa61a882f03da47e32d022e0b2b529d43 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -327,7 +327,7 @@ public:
        IWritableCraftDefManager* getWritableCraftDefManager();
 
        const ModSpec* getModSpec(const std::string &modname);
-       void getModNames(std::list<std::string> &modlist);
+       void getModNames(std::vector<std::string> &modlist);
        std::string getBuiltinLuaPath();
        inline std::string getWorldPath()
                        { return m_path_world; }
@@ -374,7 +374,7 @@ public:
 
        void SendPlayerHPOrDie(u16 peer_id, bool die) { die ? DiePlayer(peer_id) : SendPlayerHP(peer_id); }
        void SendPlayerBreath(u16 peer_id);
-       void SendInventory(u16 peer_id);
+       void SendInventory(PlayerSAO* playerSAO);
        void SendMovePlayer(u16 peer_id);
 
        // Bind address
@@ -422,9 +422,9 @@ private:
        */
        // Envlock and conlock should be locked when calling these
        void sendRemoveNode(v3s16 p, u16 ignore_id=0,
-                       std::list<u16> *far_players=NULL, float far_d_nodes=100);
+                       std::vector<u16> *far_players=NULL, float far_d_nodes=100);
        void sendAddNode(v3s16 p, MapNode n, u16 ignore_id=0,
-                       std::list<u16> *far_players=NULL, float far_d_nodes=100,
+                       std::vector<u16> *far_players=NULL, float far_d_nodes=100,
                        bool remove_metadata=true);
        void setBlockNotSent(v3s16 p);
 
@@ -437,7 +437,7 @@ private:
        void fillMediaCache();
        void sendMediaAnnouncement(u16 peer_id);
        void sendRequestedMedia(u16 peer_id,
-                       const std::list<std::string> &tosend);
+                       const std::vector<std::string> &tosend);
 
        void sendDetachedInventory(const std::string &name, u16 peer_id);
        void sendDetachedInventories(u16 peer_id);
@@ -582,15 +582,12 @@ private:
                Queues stuff from peerAdded() and deletingPeer() to
                handlePeerChanges()
        */
-       Queue<con::PeerChange> m_peer_change_queue;
+       std::queue<con::PeerChange> m_peer_change_queue;
 
        /*
                Random stuff
        */
 
-       // Mod parent directory paths
-       std::list<std::string> m_modspaths;
-
        bool m_shutdown_requested;
 
        /*
@@ -606,7 +603,7 @@ private:
                Queue of map edits from the environment for sending to the clients
                This is behind m_env_mutex
        */
-       Queue<MapEditEvent*> m_unsent_map_edit_queue;
+       std::queue<MapEditEvent*> m_unsent_map_edit_queue;
        /*
                Set to true when the server itself is modifying the map and does
                all sending of information by itself.