Fix codestyle since CSM Camera API

[dragonfireclient.git] / src / server.h

diff --git a/src/server.h b/src/server.h
index daf51dee10756b87e2dc8645db73b64cd3c11e84..2e735e77c62abeded92d77f5f6f30a4fe3618a0c 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -29,31 +29,31 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mods.h"
 #include "inventorymanager.h"
 #include "subgame.h"
 #include "mods.h"
 #include "inventorymanager.h"
 #include "subgame.h"

+#include "tileanimation.h" // struct TileAnimationParams

 #include "util/numeric.h"
 #include "util/thread.h"
 #include "util/numeric.h"
 #include "util/thread.h"

-#include "environment.h"
+#include "util/basic_macros.h"
+#include "serverenvironment.h"

 #include "chat_interface.h"
 #include "clientiface.h"
 #include "chat_interface.h"
 #include "clientiface.h"

+#include "remoteplayer.h"

 #include "network/networkpacket.h"
 #include <string>
 #include <list>
 #include <map>
 #include <vector>
 
 #include "network/networkpacket.h"
 #include <string>
 #include <list>
 #include <map>
 #include <vector>
 

-#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
-

 class IWritableItemDefManager;
 class IWritableNodeDefManager;
 class IWritableCraftDefManager;
 class BanManager;
 class EventManager;
 class Inventory;
 class IWritableItemDefManager;
 class IWritableNodeDefManager;
 class IWritableCraftDefManager;
 class BanManager;
 class EventManager;
 class Inventory;

-class Player;

 class PlayerSAO;
 class IRollbackManager;
 struct RollbackAction;
 class EmergeManager;
 class PlayerSAO;
 class IRollbackManager;
 struct RollbackAction;
 class EmergeManager;

-class GameScripting;
+class ServerScripting;

 class ServerEnvironment;
 struct SimpleSoundSpec;
 class ServerThread;
 class ServerEnvironment;
 struct SimpleSoundSpec;
 class ServerThread;


@@ -64,31 +64,6 @@ enum ClientDeletionReason {
        CDR_DENY
 };
 
        CDR_DENY
 };
 

-class MapEditEventIgnorer
-{
-public:
-       MapEditEventIgnorer(bool *flag):
-               m_flag(flag)
-       {
-               if(*m_flag == false)
-                       *m_flag = true;
-               else
-                       m_flag = NULL;
-       }
-
-       ~MapEditEventIgnorer()
-       {
-               if(m_flag)
-               {
-                       assert(*m_flag);
-                       *m_flag = false;
-               }
-       }
-
-private:
-       bool *m_flag;
-};
-

 class MapEditEventAreaIgnorer
 {
 public:
 class MapEditEventAreaIgnorer
 {
 public:


@@ -140,6 +115,7 @@ struct ServerSoundParams
        u16 object;
        float max_hear_distance;
        bool loop;
        u16 object;
        float max_hear_distance;
        bool loop;

+       float fade;

 
        ServerSoundParams():
                gain(1.0),
 
        ServerSoundParams():
                gain(1.0),


@@ -148,7 +124,8 @@ struct ServerSoundParams
                pos(0,0,0),
                object(0),
                max_hear_distance(32*BS),
                pos(0,0,0),
                object(0),
                max_hear_distance(32*BS),

-               loop(false)
+               loop(false),
+               fade(0)

        {}
 
        v3f getPos(ServerEnvironment *env, bool *pos_exists) const;
        {}
 
        v3f getPos(ServerEnvironment *env, bool *pos_exists) const;


@@ -157,7 +134,8 @@ struct ServerSoundParams
 struct ServerPlayingSound
 {
        ServerSoundParams params;
 struct ServerPlayingSound
 {
        ServerSoundParams params;

-       std::set<u16> clients; // peer ids
+       SimpleSoundSpec spec;
+       UNORDERED_SET<u16> clients; // peer ids

 };
 
 class Server : public con::PeerHandler, public MapEventReceiver,
 };
 
 class Server : public con::PeerHandler, public MapEventReceiver,


@@ -173,6 +151,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
                const SubgameSpec &gamespec,
                bool simple_singleplayer_mode,
                bool ipv6,
                const SubgameSpec &gamespec,
                bool simple_singleplayer_mode,
                bool ipv6,

+               bool dedicated,

                ChatInterface *iface = NULL
        );
        ~Server();
                ChatInterface *iface = NULL
        );
        ~Server();


@@ -198,7 +177,6 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void handleCommand_Init_Legacy(NetworkPacket* pkt);
        void handleCommand_Init2(NetworkPacket* pkt);
        void handleCommand_RequestMedia(NetworkPacket* pkt);
        void handleCommand_Init_Legacy(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_ClientReady(NetworkPacket* pkt);
        void handleCommand_GotBlocks(NetworkPacket* pkt);
        void handleCommand_PlayerPos(NetworkPacket* pkt);


@@ -206,7 +184,6 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void handleCommand_InventoryAction(NetworkPacket* pkt);
        void handleCommand_ChatMessage(NetworkPacket* pkt);
        void handleCommand_Damage(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_Password(NetworkPacket* pkt);
        void handleCommand_PlayerItem(NetworkPacket* pkt);
        void handleCommand_Respawn(NetworkPacket* pkt);


@@ -222,6 +199,10 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 
        void Send(NetworkPacket* pkt);
 
 
        void Send(NetworkPacket* pkt);
 

+       // Helper for handleCommand_PlayerPos and handleCommand_Interact
+       void process_PlayerPos(RemotePlayer *player, PlayerSAO *playersao,
+               NetworkPacket *pkt);
+

        // Both setter and getter need no envlock,
        // can be called freely from threads
        void setTimeOfDay(u32 time);
        // Both setter and getter need no envlock,
        // can be called freely from threads
        void setTimeOfDay(u32 time);


@@ -241,24 +222,19 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 
        // Connection must be locked when called
        std::wstring getStatusString();
 
        // Connection must be locked when called
        std::wstring getStatusString();

+       inline double getUptime() const { return m_uptime.m_value; }

 
        // read shutdown state
 
        // read shutdown state

-       inline bool getShutdownRequested()
-                       { return m_shutdown_requested; }
+       inline bool getShutdownRequested() const { return m_shutdown_requested; }

 
        // request server to shutdown
 
        // request server to shutdown

-       inline void requestShutdown() { m_shutdown_requested = true; }
-       void requestShutdown(const std::string &msg, bool reconnect)
-       {
-               m_shutdown_requested = true;
-               m_shutdown_msg = msg;
-               m_shutdown_ask_reconnect = reconnect;
-       }
+       void requestShutdown(const std::string &msg, bool reconnect, float delay = 0.0f);

 
        // Returns -1 if failed, sound handle on success
        // Envlock
        s32 playSound(const SimpleSoundSpec &spec, const ServerSoundParams &params);
        void stopSound(s32 handle);
 
        // Returns -1 if failed, sound handle on success
        // Envlock
        s32 playSound(const SimpleSoundSpec &spec, const ServerSoundParams &params);
        void stopSound(s32 handle);

+       void fadeSound(s32 handle, float step, float gain);

 
        // Envlock
        std::set<std::string> getPlayerEffectivePrivs(const std::string &name);
 
        // Envlock
        std::set<std::string> getPlayerEffectivePrivs(const std::string &name);


@@ -275,7 +251,9 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void spawnParticle(const std::string &playername,
                v3f pos, v3f velocity, v3f acceleration,
                float expirationtime, float size,
        void spawnParticle(const std::string &playername,
                v3f pos, v3f velocity, v3f acceleration,
                float expirationtime, float size,

-               bool collisiondetection, bool vertical, const std::string &texture);
+               bool collisiondetection, bool collision_removal,
+               bool vertical, const std::string &texture,
+               const struct TileAnimationParams &animation, u8 glow);

 
        u32 addParticleSpawner(u16 amount, float spawntime,
                v3f minpos, v3f maxpos,
 
        u32 addParticleSpawner(u16 amount, float spawntime,
                v3f minpos, v3f maxpos,


@@ -283,17 +261,19 @@ class Server : public con::PeerHandler, public MapEventReceiver,
                v3f minacc, v3f maxacc,
                float minexptime, float maxexptime,
                float minsize, float maxsize,
                v3f minacc, v3f maxacc,
                float minexptime, float maxexptime,
                float minsize, float maxsize,

-               bool collisiondetection, bool vertical, const std::string &texture,
-               const std::string &playername);
+               bool collisiondetection, bool collision_removal,
+               ServerActiveObject *attached,
+               bool vertical, const std::string &texture,
+               const std::string &playername, const struct TileAnimationParams &animation,
+               u8 glow);

 
        void deleteParticleSpawner(const std::string &playername, u32 id);
 
        void deleteParticleSpawner(const std::string &playername, u32 id);

-       void deleteParticleSpawnerAll(u32 id);

 
        // Creates or resets inventory
 
        // Creates or resets inventory

-       Inventory* createDetachedInventory(const std::string &name);
+       Inventory* createDetachedInventory(const std::string &name, const std::string &player="");

 
        // Envlock and conlock should be locked when using scriptapi
 
        // Envlock and conlock should be locked when using scriptapi

-       GameScripting *getScriptIface(){ return m_script; }
+       ServerScripting *getScriptIface(){ return m_script; }

 
        // actions: time-reversed list
        // Return value: success/failure
 
        // actions: time-reversed list
        // Return value: success/failure


@@ -305,24 +285,21 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        virtual IItemDefManager* getItemDefManager();
        virtual INodeDefManager* getNodeDefManager();
        virtual ICraftDefManager* getCraftDefManager();
        virtual IItemDefManager* getItemDefManager();
        virtual INodeDefManager* getNodeDefManager();
        virtual ICraftDefManager* getCraftDefManager();

-       virtual ITextureSource* getTextureSource();
-       virtual IShaderSource* getShaderSource();

        virtual u16 allocateUnknownNodeId(const std::string &name);
        virtual u16 allocateUnknownNodeId(const std::string &name);

-       virtual ISoundManager* getSoundManager();

        virtual MtEventManager* getEventManager();
        virtual MtEventManager* getEventManager();

-       virtual scene::ISceneManager* getSceneManager();
-       virtual IRollbackManager *getRollbackManager() { return m_rollback; }
+       IRollbackManager *getRollbackManager() { return m_rollback; }

        virtual EmergeManager *getEmergeManager() { return m_emerge; }
 
        IWritableItemDefManager* getWritableItemDefManager();
        IWritableNodeDefManager* getWritableNodeDefManager();
        IWritableCraftDefManager* getWritableCraftDefManager();
 
        virtual EmergeManager *getEmergeManager() { return m_emerge; }
 
        IWritableItemDefManager* getWritableItemDefManager();
        IWritableNodeDefManager* getWritableNodeDefManager();
        IWritableCraftDefManager* getWritableCraftDefManager();
 

-       const ModSpec* getModSpec(const std::string &modname) const;
+       virtual const std::vector<ModSpec> &getMods() const { return m_mods; }
+       virtual const ModSpec* getModSpec(const std::string &modname) const;

        void getModNames(std::vector<std::string> &modlist);
        std::string getBuiltinLuaPath();
        void getModNames(std::vector<std::string> &modlist);
        std::string getBuiltinLuaPath();

-       inline std::string getWorldPath() const
-                       { return m_path_world; }
+       virtual std::string getWorldPath() const { return m_path_world; }
+       virtual std::string getModStoragePath() const;

 
        inline bool isSingleplayer()
                        { return m_simple_singleplayer_mode; }
 
        inline bool isSingleplayer()
                        { return m_simple_singleplayer_mode; }


@@ -333,29 +310,41 @@ 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; }
        bool showFormspec(const char *name, const std::string &formspec, const std::string &formname);
        Map & getMap() { return m_env->getMap(); }
        ServerEnvironment & getEnv() { return *m_env; }

+       v3f findSpawnPos();

 
 

-       u32 hudAdd(Player *player, HudElement *element);
-       bool hudRemove(Player *player, u32 id);
-       bool hudChange(Player *player, u32 id, HudElementStat stat, void *value);
-       bool hudSetFlags(Player *player, u32 flags, u32 mask);
-       bool hudSetHotbarItemcount(Player *player, s32 hotbar_itemcount);
-       s32 hudGetHotbarItemcount(Player *player);
-       void hudSetHotbarImage(Player *player, std::string name);
-       std::string hudGetHotbarImage(Player *player);
-       void hudSetHotbarSelectedImage(Player *player, std::string name);
-       std::string hudGetHotbarSelectedImage(Player *player);
+       u32 hudAdd(RemotePlayer *player, HudElement *element);
+       bool hudRemove(RemotePlayer *player, u32 id);
+       bool hudChange(RemotePlayer *player, u32 id, HudElementStat stat, void *value);
+       bool hudSetFlags(RemotePlayer *player, u32 flags, u32 mask);
+       bool hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount);
+       s32 hudGetHotbarItemcount(RemotePlayer *player) const
+                       { return player->getHotbarItemcount(); }
+       void hudSetHotbarImage(RemotePlayer *player, std::string name);
+       std::string hudGetHotbarImage(RemotePlayer *player);
+       void hudSetHotbarSelectedImage(RemotePlayer *player, std::string name);
+       const std::string &hudGetHotbarSelectedImage(RemotePlayer *player) const
+       {
+               return player->getHotbarSelectedImage();
+       }

 
        inline Address getPeerAddress(u16 peer_id)
                        { return m_con.GetPeerAddress(peer_id); }
 
 
        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 setLocalPlayerAnimations(RemotePlayer *player, v2s32 animation_frames[4],
+                       f32 frame_speed);
+       bool setPlayerEyeOffset(RemotePlayer *player, v3f first, v3f third);

 
 

-       bool setSky(Player *player, const video::SColor &bgcolor,
-                       const std::string &type, const std::vector<std::string> &params);
+       bool setSky(RemotePlayer *player, const video::SColor &bgcolor,
+                       const std::string &type, const std::vector<std::string> &params,
+                       bool &clouds);
+       bool setClouds(RemotePlayer *player, float density,
+                       const video::SColor &color_bright,
+                       const video::SColor &color_ambient,
+                       float height,
+                       float thickness,
+                       const v2f &speed);

 
 

-       bool overrideDayNightRatio(Player *player, bool do_override,
-                       float brightness);
+       bool overrideDayNightRatio(RemotePlayer *player, bool do_override, float brightness);

 
        /* con::PeerHandler implementation. */
        void peerAdded(con::Peer *peer);
 
        /* con::PeerHandler implementation. */
        void peerAdded(con::Peer *peer);


@@ -375,10 +364,13 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void printToConsoleOnly(const std::string &text);
 
        void SendPlayerHPOrDie(PlayerSAO *player);
        void printToConsoleOnly(const std::string &text);
 
        void SendPlayerHPOrDie(PlayerSAO *player);

-       void SendPlayerBreath(u16 peer_id);
+       void SendPlayerBreath(PlayerSAO *sao);

        void SendInventory(PlayerSAO* playerSAO);
        void SendMovePlayer(u16 peer_id);
 
        void SendInventory(PlayerSAO* playerSAO);
        void SendMovePlayer(u16 peer_id);
 

+       virtual bool registerModStorage(ModMetadata *storage);
+       virtual void unregisterModStorage(const std::string &name);
+

        // Bind address
        Address m_bind_addr;
 
        // Bind address
        Address m_bind_addr;
 


@@ -419,7 +411,14 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void SendHUDSetFlags(u16 peer_id, u32 flags, u32 mask);
        void SendHUDSetParam(u16 peer_id, u16 param, const std::string &value);
        void SendSetSky(u16 peer_id, const video::SColor &bgcolor,
        void SendHUDSetFlags(u16 peer_id, u32 flags, u32 mask);
        void SendHUDSetParam(u16 peer_id, u16 param, const std::string &value);
        void SendSetSky(u16 peer_id, const video::SColor &bgcolor,

-                       const std::string &type, const std::vector<std::string> &params);
+                       const std::string &type, const std::vector<std::string> &params,
+                       bool &clouds);
+       void SendCloudParams(u16 peer_id, float density,
+                       const video::SColor &color_bright,
+                       const video::SColor &color_ambient,
+                       float height,
+                       float thickness,
+                       const v2f &speed);

        void SendOverrideDayNightRatio(u16 peer_id, bool do_override, float ratio);
 
        /*
        void SendOverrideDayNightRatio(u16 peer_id, bool do_override, float ratio);
 
        /*


@@ -450,21 +449,27 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void sendDetachedInventories(u16 peer_id);
 
        // Adds a ParticleSpawner on peer with peer_id (PEER_ID_INEXISTENT == all)
        void sendDetachedInventories(u16 peer_id);
 
        // Adds a ParticleSpawner on peer with peer_id (PEER_ID_INEXISTENT == all)

-       void SendAddParticleSpawner(u16 peer_id, u16 amount, float spawntime,
+       void SendAddParticleSpawner(u16 peer_id, u16 protocol_version,
+               u16 amount, float spawntime,

                v3f minpos, v3f maxpos,
                v3f minvel, v3f maxvel,
                v3f minacc, v3f maxacc,
                float minexptime, float maxexptime,
                float minsize, float maxsize,
                v3f minpos, v3f maxpos,
                v3f minvel, v3f maxvel,
                v3f minacc, v3f maxacc,
                float minexptime, float maxexptime,
                float minsize, float maxsize,

-               bool collisiondetection, bool vertical, std::string texture, u32 id);
+               bool collisiondetection, bool collision_removal,
+               u16 attached_id,
+               bool vertical, const std::string &texture, u32 id,
+               const struct TileAnimationParams &animation, u8 glow);

 
        void SendDeleteParticleSpawner(u16 peer_id, u32 id);
 
        // Spawns particle on peer with peer_id (PEER_ID_INEXISTENT == all)
 
        void SendDeleteParticleSpawner(u16 peer_id, u32 id);
 
        // Spawns particle on peer with peer_id (PEER_ID_INEXISTENT == all)

-       void SendSpawnParticle(u16 peer_id,
+       void SendSpawnParticle(u16 peer_id, u16 protocol_version,

                v3f pos, v3f velocity, v3f acceleration,
                float expirationtime, float size,
                v3f pos, v3f velocity, v3f acceleration,
                float expirationtime, float size,

-               bool collisiondetection, bool vertical, std::string texture);
+               bool collisiondetection, bool collision_removal,
+               bool vertical, const std::string &texture,
+               const struct TileAnimationParams &animation, u8 glow);

 
        u32 SendActiveObjectRemoveAdd(u16 peer_id, const std::string &datas);
        void SendActiveObjectMessages(u16 peer_id, const std::string &datas, bool reliable = true);
 
        u32 SendActiveObjectRemoveAdd(u16 peer_id, const std::string &datas);
        void SendActiveObjectMessages(u16 peer_id, const std::string &datas, bool reliable = true);


@@ -475,7 +480,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void DiePlayer(u16 peer_id);
        void RespawnPlayer(u16 peer_id);
        void DeleteClient(u16 peer_id, ClientDeletionReason reason);
        void DiePlayer(u16 peer_id);
        void RespawnPlayer(u16 peer_id);
        void DeleteClient(u16 peer_id, ClientDeletionReason reason);

-       void UpdateCrafting(Player *player);
+       void UpdateCrafting(RemotePlayer *player);

 
        void handleChatInterfaceEvent(ChatEvent *evt);
 
 
        void handleChatInterfaceEvent(ChatEvent *evt);
 


@@ -483,11 +488,9 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        std::wstring handleChat(const std::string &name, const std::wstring &wname,
                const std::wstring &wmessage,
                bool check_shout_priv = false,
        std::wstring handleChat(const std::string &name, const std::wstring &wname,
                const std::wstring &wmessage,
                bool check_shout_priv = false,

-               u16 peer_id_to_avoid_sending = PEER_ID_INEXISTENT);
+               RemotePlayer *player = NULL);

        void handleAdminChat(const ChatEventChat *evt);
 
        void handleAdminChat(const ChatEventChat *evt);
 

-       v3f findSpawnPos();
-

        // When called, connection mutex should be locked
        RemoteClient* getClient(u16 peer_id,ClientState state_min=CS_Active);
        RemoteClient* getClientNoEx(u16 peer_id,ClientState state_min=CS_Active);
        // When called, connection mutex should be locked
        RemoteClient* getClient(u16 peer_id,ClientState state_min=CS_Active);
        RemoteClient* getClientNoEx(u16 peer_id,ClientState state_min=CS_Active);


@@ -518,6 +521,9 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        // If true, do not allow multiple players and hide some multiplayer
        // functionality
        bool m_simple_singleplayer_mode;
        // If true, do not allow multiple players and hide some multiplayer
        // functionality
        bool m_simple_singleplayer_mode;

+       u16 m_max_chatmessage_length;
+       // For "dedicated" server list flag
+       bool m_dedicated;

 
        // Thread can set; step() will throw as ServerError
        MutexedVariable<std::string> m_async_fatal_error;
 
        // Thread can set; step() will throw as ServerError
        MutexedVariable<std::string> m_async_fatal_error;


@@ -525,9 +531,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        // Some timers
        float m_liquid_transform_timer;
        float m_liquid_transform_every;
        // Some timers
        float m_liquid_transform_timer;
        float m_liquid_transform_every;

-       float m_print_info_timer;

        float m_masterserver_timer;
        float m_masterserver_timer;

-       float m_objectdata_timer;

        float m_emergethread_trigger_timer;
        float m_savemap_timer;
        IntervalLimiter m_map_timer_and_unload_interval;
        float m_emergethread_trigger_timer;
        float m_savemap_timer;
        IntervalLimiter m_map_timer_and_unload_interval;


@@ -550,7 +554,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 
        // Scripting
        // Envlock and conlock should be locked when using Lua
 
        // Scripting
        // Envlock and conlock should be locked when using Lua

-       GameScripting *m_script;
+       ServerScripting *m_script;

 
        // Item definition manager
        IWritableItemDefManager *m_itemdef;
 
        // Item definition manager
        IWritableItemDefManager *m_itemdef;


@@ -590,7 +594,6 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        float m_time_of_day_send_timer;
        // Uptime of server in seconds
        MutexedVariable<double> m_uptime;
        float m_time_of_day_send_timer;
        // Uptime of server in seconds
        MutexedVariable<double> m_uptime;

-

        /*
         Client interface
         */
        /*
         Client interface
         */


@@ -610,6 +613,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        bool m_shutdown_requested;
        std::string m_shutdown_msg;
        bool m_shutdown_ask_reconnect;
        bool m_shutdown_requested;
        std::string m_shutdown_msg;
        bool m_shutdown_ask_reconnect;

+       float m_shutdown_timer;

 
        ChatInterface *m_admin_chat;
        std::string m_admin_nick;
 
        ChatInterface *m_admin_chat;
        std::string m_admin_nick;


@@ -649,12 +653,12 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        u16 m_ignore_map_edit_events_peer_id;
 
        // media files known to server
        u16 m_ignore_map_edit_events_peer_id;
 
        // media files known to server

-       std::map<std::string,MediaInfo> m_media;
+       UNORDERED_MAP<std::string, MediaInfo> m_media;

 
        /*
                Sounds
        */
 
        /*
                Sounds
        */

-       std::map<s32, ServerPlayingSound> m_playing_sounds;
+       UNORDERED_MAP<s32, ServerPlayingSound> m_playing_sounds;

        s32 m_next_sound_id;
 
        /*
        s32 m_next_sound_id;
 
        /*


@@ -662,6 +666,11 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        */
        // key = name
        std::map<std::string, Inventory*> m_detached_inventories;
        */
        // key = name
        std::map<std::string, Inventory*> m_detached_inventories;

+       // value = "" (visible to all players) or player name
+       std::map<std::string, std::string> m_detached_inventories_player;
+
+       UNORDERED_MAP<std::string, ModMetadata *> m_mod_storages;
+       float m_mod_storage_save_timer;

 
        DISABLE_CLASS_COPY(Server);
 };
 
        DISABLE_CLASS_COPY(Server);
 };