Noise: Prevent unittest crash caused by division by zero

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

diff --git a/src/activeobject.h b/src/activeobject.h
index 71b9df5147b545a7f3eb237eda5c987349134757..4796e168c42fa680b7c76424f35903f2de2d240b 100644 (file)
--- a/src/activeobject.h
+++ b/src/activeobject.h
@@ -28,9 +28,9 @@ enum ActiveObjectType {
        ACTIVEOBJECT_TYPE_TEST = 1,
 // Deprecated stuff
        ACTIVEOBJECT_TYPE_ITEM = 2,
-       ACTIVEOBJECT_TYPE_RAT = 3,
-       ACTIVEOBJECT_TYPE_OERKKI1 = 4,
-       ACTIVEOBJECT_TYPE_FIREFLY = 5,
+//     ACTIVEOBJECT_TYPE_RAT = 3,
+//     ACTIVEOBJECT_TYPE_OERKKI1 = 4,
+//     ACTIVEOBJECT_TYPE_FIREFLY = 5,
        ACTIVEOBJECT_TYPE_MOBV2 = 6,
 // End deprecated stuff
        ACTIVEOBJECT_TYPE_LUAENTITY = 7,
@@ -65,7 +65,7 @@ public:
        {
        }
 
-       u16 getId()
+       u16 getId() const
        {
                return m_id;
        }
@@ -76,7 +76,28 @@ public:
        }
 
        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"