diff options
| author | Weblate <42@minetest.ru> | 2013-05-01 15:33:15 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-05-01 15:33:15 +0200 |
| commit | 97cddd1b960e3b60ce74ff9ad16307b39676144e (patch) | |
| tree | 0547ab284acc0fdf8aad2a36643be6f78f786ef1 /src/player.h | |
| parent | f1f2004cb9efb026625b192b404064c26ceb6d5f (diff) | |
| parent | 898a4e441fc0245aaf4821ff5e3dad0daccda3b5 (diff) | |
| download | minetest-97cddd1b960e3b60ce74ff9ad16307b39676144e.tar.gz minetest-97cddd1b960e3b60ce74ff9ad16307b39676144e.tar.bz2 minetest-97cddd1b960e3b60ce74ff9ad16307b39676144e.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/player.h')
| -rw-r--r-- | src/player.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/player.h b/src/player.h index d0e50d2c3..fade6de01 100644 --- a/src/player.h +++ b/src/player.h @@ -180,6 +180,10 @@ public: return m_name; } + core::aabbox3d<f32> getCollisionbox() { + return m_collisionbox; + } + virtual bool isLocal() const { return false; } virtual PlayerSAO *getPlayerSAO() @@ -245,6 +249,7 @@ public: u32 keyPressed; std::vector<HudElement *> hud; + u32 hud_flags; protected: IGameDef *m_gamedef; @@ -254,6 +259,7 @@ protected: f32 m_yaw; v3f m_speed; v3f m_position; + core::aabbox3d<f32> m_collisionbox; }; |