Fix Android build, but there is a remaining linking issue in guiConfirmRegistration

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

diff --git a/src/clientobject.h b/src/clientobject.h
index f8075d65a84a40ea206a9e05bc64b81f6cf287c2..c85e1ec916ebffcc2996855f85e9adb7e3f60493 100644 (file)
--- a/src/clientobject.h
+++ b/src/clientobject.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CLIENTOBJECT_HEADER
-#define CLIENTOBJECT_HEADER
+#pragma once
 
 #include "irrlichttypes_extrabloated.h"
 #include "activeobject.h"
@@ -44,8 +43,8 @@ public:
        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; }
@@ -106,5 +105,3 @@ struct DistanceSortedActiveObject
                return d < other.d;
        }
 };
-
-#endif