Fix a crash (assert) when client set serial version < 24 in INIT

[minetest.git] / src / content_cao.h

diff --git a/src/content_cao.h b/src/content_cao.h
index 1e55babf2fd0c6fbfdf4adb563208c8a41e46544..69e2e54a264502fef563f2a48de2e3065d750e20 100644 (file)
--- a/src/content_cao.h
+++ b/src/content_cao.h
@@ -70,6 +70,7 @@ class GenericCAO : public ClientActiveObject
        core::aabbox3d<f32> m_selection_box;
        scene::IMeshSceneNode *m_meshnode;
        scene::IAnimatedMeshSceneNode *m_animated_meshnode;
+       WieldMeshSceneNode *m_wield_meshnode;
        scene::IBillboardSceneNode *m_spritenode;
        scene::ITextSceneNode* m_textnode;
        v3f m_position;
@@ -102,6 +103,8 @@ class GenericCAO : public ClientActiveObject
        u8 m_last_light;
        bool m_is_visible;
 
+       std::vector<u16> m_children;
+
 public:
        GenericCAO(IGameDef *gamedef, ClientEnvironment *env);
 
@@ -129,10 +132,14 @@ class GenericCAO : public ClientActiveObject
 
        v3f getPosition();
 
+       scene::ISceneNode *getSceneNode();
+
        scene::IMeshSceneNode *getMeshSceneNode();
 
        scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode();
 
+       WieldMeshSceneNode *getWieldMeshSceneNode();
+
        scene::IBillboardSceneNode *getSpriteSceneNode();
 
        inline bool isPlayer() const
@@ -195,4 +202,3 @@ class GenericCAO : public ClientActiveObject
 
 
 #endif
-