diff options
Diffstat (limited to 'src/content_cao.h')
| -rw-r--r-- | src/content_cao.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/content_cao.h b/src/content_cao.h index a166ff494..a158e8296 100644 --- a/src/content_cao.h +++ b/src/content_cao.h @@ -68,7 +68,6 @@ private: // scene::ISceneManager *m_smgr; IrrlichtDevice *m_irr; - Camera* m_camera; IGameDef *m_gamedef; aabb3f m_selection_box; scene::IMeshSceneNode *m_meshnode; @@ -91,7 +90,7 @@ private: int m_animation_speed; int m_animation_blend; bool m_animation_loop; - std::map<std::string, core::vector2d<v3f> > m_bone_position; // stores position and rotation for each bone name + UNORDERED_MAP<std::string, core::vector2d<v3f> > m_bone_position; // stores position and rotation for each bone name std::string m_attachment_bone; v3f m_attachment_position; v3f m_attachment_rotation; @@ -126,6 +125,8 @@ public: void initialize(const std::string &data); + void processInitData(const std::string &data); + ClientActiveObject *getParent(); bool getCollisionBox(aabb3f *toset); @@ -135,6 +136,10 @@ public: aabb3f *getSelectionBox(); v3f getPosition(); + inline float getYaw() const + { + return m_yaw; + } scene::ISceneNode *getSceneNode(); @@ -206,7 +211,7 @@ public: float time_from_last_punch=1000000); std::string debugInfoText(); - + std::string infoText() { return m_prop.infotext; |