diff options
Diffstat (limited to 'src/content_cao.h')
| -rw-r--r-- | src/content_cao.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/content_cao.h b/src/content_cao.h index 299d6c73e..a166ff494 100644 --- a/src/content_cao.h +++ b/src/content_cao.h @@ -26,6 +26,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "object_properties.h" #include "itemgroup.h" +class Camera; +struct Nametag; + /* SmoothTranslator */ @@ -65,13 +68,14 @@ private: // scene::ISceneManager *m_smgr; IrrlichtDevice *m_irr; - core::aabbox3d<f32> m_selection_box; + Camera* m_camera; + IGameDef *m_gamedef; + aabb3f m_selection_box; scene::IMeshSceneNode *m_meshnode; scene::IAnimatedMeshSceneNode *m_animated_meshnode; WieldMeshSceneNode *m_wield_meshnode; scene::IBillboardSceneNode *m_spritenode; - video::SColor m_nametag_color; - scene::ITextSceneNode* m_textnode; + Nametag* m_nametag; v3f m_position; v3f m_velocity; v3f m_acceleration; @@ -128,7 +132,7 @@ public: bool collideWithObjects(); - core::aabbox3d<f32>* getSelectionBox(); + aabb3f *getSelectionBox(); v3f getPosition(); @@ -202,6 +206,11 @@ public: float time_from_last_punch=1000000); std::string debugInfoText(); + + std::string infoText() + { + return m_prop.infotext; + } }; |