Modernize client code (#6250)

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

diff --git a/src/clientobject.h b/src/clientobject.h
index a3eb3e2422529cd9cbdb736193993061797a82d2..eeed2516d1ed5b1fa86e385457d65538a7b2a9a7 100644 (file)
--- a/src/clientobject.h
+++ b/src/clientobject.h
@@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "irrlichttypes_extrabloated.h"
 #include "activeobject.h"
-#include <map>
 #include <unordered_map>
 
 class ClientEnvironment;
@@ -39,15 +38,14 @@ public:
        ClientActiveObject(u16 id, Client *client, ClientEnvironment *env);
        virtual ~ClientActiveObject();
 
-       virtual void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
-                       IrrlichtDevice *irr){}
-       virtual void removeFromScene(bool permanent){}
+       virtual void addToScene(ITextureSource *tsrc) {};
+       virtual void removeFromScene(bool permanent) {}
        // 0 <= light_at_pos <= LIGHT_SUN
        virtual void updateLight(u8 light_at_pos){}
        virtual void updateLightNoCheck(u8 light_at_pos){}
        virtual v3s16 getLightPosition(){return v3s16(0,0,0);}
-       virtual aabb3f *getSelectionBox() { return NULL; }
        virtual bool getCollisionBox(aabb3f *toset) const { return false; }
+       virtual bool getSelectionBox(aabb3f *toset) const { return false; }
        virtual bool collideWithObjects() const { return false; }
        virtual v3f getPosition(){ return v3f(0,0,0); }
        virtual float getYaw() const { return 0; }