diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2016-10-06 19:20:12 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2016-10-06 22:37:26 +0200 |
| commit | 155288ee981c70f505526347cb2bcda4df1c8e6b (patch) | |
| tree | 582095bc50cb60d3dedb9f6a08e908324a3da365 /src/server.h | |
| parent | b66a5d2f8842cc84ae44257dc0ead255e5b0538f (diff) | |
| download | minetest-155288ee981c70f505526347cb2bcda4df1c8e6b.tar.gz minetest-155288ee981c70f505526347cb2bcda4df1c8e6b.tar.bz2 minetest-155288ee981c70f505526347cb2bcda4df1c8e6b.zip | |
use unordered containers where possible (patch 4 on X)
Also remove some unused parameters/functions
Diffstat (limited to 'src/server.h')
| -rw-r--r-- | src/server.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/server.h b/src/server.h index 3ad894b38..34427a71a 100644 --- a/src/server.h +++ b/src/server.h @@ -157,7 +157,7 @@ struct ServerSoundParams struct ServerPlayingSound { ServerSoundParams params; - std::set<u16> clients; // peer ids + UNORDERED_SET<u16> clients; // peer ids }; class Server : public con::PeerHandler, public MapEventReceiver, @@ -243,11 +243,9 @@ public: std::wstring getStatusString(); // read shutdown state - inline bool getShutdownRequested() - { return m_shutdown_requested; } + inline bool getShutdownRequested() const { return m_shutdown_requested; } // request server to shutdown - inline void requestShutdown() { m_shutdown_requested = true; } void requestShutdown(const std::string &msg, bool reconnect) { m_shutdown_requested = true; @@ -323,8 +321,7 @@ public: const ModSpec* getModSpec(const std::string &modname) const; void getModNames(std::vector<std::string> &modlist); std::string getBuiltinLuaPath(); - inline std::string getWorldPath() const - { return m_path_world; } + inline std::string getWorldPath() const { return m_path_world; } inline bool isSingleplayer() { return m_simple_singleplayer_mode; } @@ -356,8 +353,7 @@ public: bool setSky(Player *player, const video::SColor &bgcolor, const std::string &type, const std::vector<std::string> ¶ms); - bool overrideDayNightRatio(Player *player, bool do_override, - float brightness); + bool overrideDayNightRatio(Player *player, bool do_override, float brightness); /* con::PeerHandler implementation. */ void peerAdded(con::Peer *peer); @@ -654,12 +650,12 @@ private: 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 */ - std::map<s32, ServerPlayingSound> m_playing_sounds; + UNORDERED_MAP<s32, ServerPlayingSound> m_playing_sounds; s32 m_next_sound_id; /* |