diff options
| author | Weblate <42@minetest.ru> | 2013-04-18 20:00:16 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-04-18 20:00:16 +0200 |
| commit | 9e6376bd95ba9309365b39b878ab2f499776437a (patch) | |
| tree | a354a250daedf036cc36e33d3d1ebb9fafc4ac27 /src/player.h | |
| parent | e385af7cc01d156164b85d10b00a7047a5372e66 (diff) | |
| parent | e60eb32050a44d344795e4a1515a56038bb97e02 (diff) | |
| download | minetest-9e6376bd95ba9309365b39b878ab2f499776437a.tar.gz minetest-9e6376bd95ba9309365b39b878ab2f499776437a.tar.bz2 minetest-9e6376bd95ba9309365b39b878ab2f499776437a.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/player.h')
| -rw-r--r-- | src/player.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/player.h b/src/player.h index d95e535ff..d0e50d2c3 100644 --- a/src/player.h +++ b/src/player.h @@ -87,6 +87,7 @@ class Map; class IGameDef; struct CollisionInfo; class PlayerSAO; +class HudElement; class Player { @@ -242,6 +243,8 @@ public: } u32 keyPressed; + + std::vector<HudElement *> hud; protected: IGameDef *m_gamedef; @@ -253,6 +256,7 @@ protected: v3f m_position; }; + /* Player on the server */ |