diff options
author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-08-18 19:25:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-18 19:25:07 +0200 |
commit | fd3afbced5410639325e730d5710b8b5039b320e (patch) | |
tree | 72e7059aa256706062b9ce2cd9ec5b0df76f5ede /src/server.h | |
parent | c42753338924bb29c61081c9f269772f89bcd808 (diff) | |
download | minetest-fd3afbced5410639325e730d5710b8b5039b320e.tar.gz minetest-fd3afbced5410639325e730d5710b8b5039b320e.tar.bz2 minetest-fd3afbced5410639325e730d5710b8b5039b320e.zip |
Optimize headers (part 2) (#6272)
* Optimize headers (part 2)
* less debug.h in headers
* less remoteplayer.h for everybody
* Cleanup (part 2)
* camera.h: mesh.h
* mapgen.h: mapnode.h
* serverenvironment.h: mapblock.h
* nodedef.h: shader.h
Diffstat (limited to 'src/server.h')
-rw-r--r-- | src/server.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/server.h b/src/server.h index 6955306dd..eeb134a5c 100644 --- a/src/server.h +++ b/src/server.h @@ -34,7 +34,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/basic_macros.h" #include "serverenvironment.h" #include "clientiface.h" -#include "remoteplayer.h" #include "chatmessage.h" #include <string> #include <list> @@ -50,6 +49,7 @@ class IWritableCraftDefManager; class BanManager; class EventManager; class Inventory; +class RemotePlayer; class PlayerSAO; class IRollbackManager; struct RollbackAction; @@ -285,15 +285,11 @@ public: 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(); } + s32 hudGetHotbarItemcount(RemotePlayer *player) const; 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(); - } + const std::string &hudGetHotbarSelectedImage(RemotePlayer *player) const; inline Address getPeerAddress(u16 peer_id) { return m_con.GetPeerAddress(peer_id); } |