Prevent SIGFPE on entity tile loading issue. (#5178)

[minetest.git] / src / content_cao.h

diff --git a/src/content_cao.h b/src/content_cao.h
index a166ff4943d34bad84bc9214ead733ea48e3d489..f30e90e21049f2359d13a8c34c27461e18326299 100644 (file)
--- a/src/content_cao.h
+++ b/src/content_cao.h
@@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "itemgroup.h"
 
 class Camera;
+class Client;
 struct Nametag;
 
 /*
@@ -68,8 +69,7 @@ class GenericCAO : public ClientActiveObject
        //
        scene::ISceneManager *m_smgr;
        IrrlichtDevice *m_irr;
-       Camera* m_camera;
-       IGameDef *m_gamedef;
+       Client *m_client;
        aabb3f m_selection_box;
        scene::IMeshSceneNode *m_meshnode;
        scene::IAnimatedMeshSceneNode *m_animated_meshnode;
@@ -91,7 +91,7 @@ class GenericCAO : public ClientActiveObject
        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;
@@ -102,6 +102,8 @@ class GenericCAO : public ClientActiveObject
        float m_anim_timer;
        ItemGroupList m_armor_groups;
        float m_reset_textures_timer;
+       std::string m_previous_texture_modifier; // stores texture modifier before punch update
+       std::string m_current_texture_modifier;  // last applied texture modifier
        bool m_visuals_expired;
        float m_step_distance_counter;
        u8 m_last_light;
@@ -110,13 +112,13 @@ class GenericCAO : public ClientActiveObject
        std::vector<u16> m_children;
 
 public:
-       GenericCAO(IGameDef *gamedef, ClientEnvironment *env);
+       GenericCAO(Client *client, ClientEnvironment *env);
 
        ~GenericCAO();
 
-       static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env)
+       static ClientActiveObject* create(Client *client, ClientEnvironment *env)
        {
-               return new GenericCAO(gamedef, env);
+               return new GenericCAO(client, env);
        }
 
        inline ActiveObjectType getType() const
@@ -126,15 +128,21 @@ class GenericCAO : public ClientActiveObject
 
        void initialize(const std::string &data);
 
+       void processInitData(const std::string &data);
+
        ClientActiveObject *getParent();
 
-       bool getCollisionBox(aabb3f *toset);
+       bool getCollisionBox(aabb3f *toset) const;
 
-       bool collideWithObjects();
+       bool collideWithObjects() const;
 
        aabb3f *getSelectionBox();
 
        v3f getPosition();
+       inline float getYaw() const
+       {
+               return m_yaw;
+       }
 
        scene::ISceneNode *getSceneNode();
 
@@ -192,7 +200,7 @@ class GenericCAO : public ClientActiveObject
 
        void updateTexturePos();
 
-       void updateTextures(const std::string &mod);
+       void updateTextures(const std::string mod);
 
        void updateAnimation();
 
@@ -206,7 +214,7 @@ class GenericCAO : public ClientActiveObject
                        float time_from_last_punch=1000000);
 
        std::string debugInfoText();
-       
+
        std::string infoText()
        {
                return m_prop.infotext;