LocalPlayer::accelerateHorizontal: cleanups

[oweals/minetest.git] / src / wieldmesh.h

diff --git a/src/wieldmesh.h b/src/wieldmesh.h
index faedce484ab300d29c244d7d45cac2dd0880bc92..44bca8e9f9ec0171fec1787fc4cf5af0ebeadf9a 100644 (file)
--- a/src/wieldmesh.h
+++ b/src/wieldmesh.h
@@ -38,13 +38,13 @@ struct ItemPartColor
         * will be used instead of the specific color of the
         * buffer.
         */
-       bool override_base;
+       bool override_base = false;
        /*!
         * The color of the buffer.
         */
-       video::SColor color;
+       video::SColor color = 0;
 
-       ItemPartColor() : override_base(false), color(0) {}
+       ItemPartColor() {}
 
        ItemPartColor(bool override, video::SColor color)
            : override_base(override), color(color)
@@ -54,7 +54,7 @@ struct ItemPartColor
 
 struct ItemMesh
 {
-       scene::IMesh *mesh;
+       scene::IMesh *mesh = nullptr;
        /*!
         * Stores the color of each mesh buffer.
         */
@@ -63,9 +63,9 @@ struct ItemMesh
         * If false, all faces of the item should have the same brightness.
         * Disables shading based on normal vectors.
         */
-       bool needs_shading;
+       bool needs_shading = true;
 
-       ItemMesh() : mesh(NULL), buffer_colors(), needs_shading(true) {}
+       ItemMesh() {}
 };
 
 /*
@@ -74,11 +74,10 @@ struct ItemMesh
 class WieldMeshSceneNode : public scene::ISceneNode
 {
 public:
-       WieldMeshSceneNode(scene::ISceneNode *parent, scene::ISceneManager *mgr,
-                       s32 id = -1, bool lighting = false);
+       WieldMeshSceneNode(scene::ISceneManager *mgr, s32 id = -1, bool lighting = false);
        virtual ~WieldMeshSceneNode();
 
-       void setCube(const ContentFeatures &f, v3f wield_scale, ITextureSource *tsrc);
+       void setCube(const ContentFeatures &f, v3f wield_scale);
        void setExtruded(const std::string &imagename, v3f wield_scale,
                        ITextureSource *tsrc, u8 num_frames);
        void setItem(const ItemStack &item, Client *client);
@@ -97,7 +96,7 @@ private:
        void changeToMesh(scene::IMesh *mesh);
 
        // Child scene node with the current wield mesh
-       scene::IMeshSceneNode *m_meshnode;
+       scene::IMeshSceneNode *m_meshnode = nullptr;
        video::E_MATERIAL_TYPE m_material_type;
 
        // True if EMF_LIGHTING should be enabled.