luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-13 08:35:20 +02:00
Code Activity

Optimize headers (part 2) (#6272)

Browse Source 
* 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
This commit is contained in:
Loïc Blot
2017-08-18 19:25:07 +02:00
committed by GitHub
parent c427533389
commit fd3afbced5
42 changed files with 55 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server.h
View File

@@ -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); }