ItemCAO removal (#6279)

[minetest.git] / src / activeobject.h

diff --git a/src/activeobject.h b/src/activeobject.h
index f349ddef35742cc5fb35b0ce023ec313dd63437a..b6a0e67af37e51603c0a53ef584f6ff04f163346 100644 (file)
--- a/src/activeobject.h
+++ b/src/activeobject.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 ACTIVEOBJECT_HEADER
-#define ACTIVEOBJECT_HEADER
+#pragma once
 
 #include "irr_aabb3d.h"
 #include <string>
@@ -65,7 +64,7 @@ class ActiveObject
        {
        }
 
-       u16 getId()
+       u16 getId() const
        {
                return m_id;
        }
@@ -76,11 +75,29 @@ class ActiveObject
        }
 
        virtual ActiveObjectType getType() const = 0;
+
+
+       /*!
+        * Returns the collision box of the object.
+        * This box is translated by the object's
+        * location.
+        * The box's coordinates are world coordinates.
+        * @returns true if the object has a collision box.
+        */
        virtual bool getCollisionBox(aabb3f *toset) const = 0;
+
+
+       /*!
+        * Returns the selection box of the object.
+        * This box is not translated when the
+        * object moves.
+        * The box's coordinates are world coordinates.
+        * @returns true if the object has a selection box.
+        */
+       virtual bool getSelectionBox(aabb3f *toset) const = 0;
+
+
        virtual bool collideWithObjects() const = 0;
 protected:
        u16 m_id; // 0 is invalid, "no id"
 };
-
-#endif
-