Modernize client code (#6250)

[oweals/minetest.git] / src / content_cso.cpp

diff --git a/src/content_cso.cpp b/src/content_cso.cpp
index c0407f4609a132f66c77ec58d7cdff7ce0fcad7c..10d1f498b82b74fe47d731540dcaa8ef2f55c0ea 100644 (file)
--- a/src/content_cso.cpp
+++ b/src/content_cso.cpp
@@ -21,29 +21,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <IBillboardSceneNode.h>
 #include "client/tile.h"
 #include "clientenvironment.h"
-#include "gamedef.h"
+#include "client.h"
 #include "map.h"
 
-/*
-static void setBillboardTextureMatrix(scene::IBillboardSceneNode *bill,
-               float txs, float tys, int col, int row)
-{
-       video::SMaterial& material = bill->getMaterial(0);
-       core::matrix4& matrix = material.getTextureMatrix(0);
-       matrix.setTextureTranslate(txs*col, tys*row);
-       matrix.setTextureScale(txs, tys);
-}
-*/
-
 class SmokePuffCSO: public ClientSimpleObject
 {
-       float m_age;
-       scene::IBillboardSceneNode *m_spritenode;
+       float m_age = 0.0f;
+       scene::IBillboardSceneNode *m_spritenode = nullptr;
 public:
        SmokePuffCSO(scene::ISceneManager *smgr,
-                       ClientEnvironment *env, v3f pos, v2f size):
-               m_age(0),
-               m_spritenode(NULL)
+                       ClientEnvironment *env, v3f pos, v2f size)
        {
                infostream<<"SmokePuffCSO: constructing"<<std::endl;
                m_spritenode = smgr->addBillboardSceneNode(