Update minetest.conf.example, settings strings and locale files (#8230)

[minetest.git] / src / activeobject.h

diff --git a/src/activeobject.h b/src/activeobject.h
index 76893280a5a504831af04e04122f0022cffa8eaf..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>
@@ -26,12 +25,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 enum ActiveObjectType {
        ACTIVEOBJECT_TYPE_INVALID = 0,
        ACTIVEOBJECT_TYPE_TEST = 1,
+// Deprecated stuff
        ACTIVEOBJECT_TYPE_ITEM = 2,
-       // Compat layer, migrating objects from 0.3 to 0.4+
-       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,
 // Special type, not stored as a static object
        ACTIVEOBJECT_TYPE_PLAYER = 100,
@@ -42,7 +42,7 @@ enum ActiveObjectType {
 
 struct ActiveObjectMessage
 {
-       ActiveObjectMessage(u16 id_, bool reliable_=true, std::string data_=""):
+       ActiveObjectMessage(u16 id_, bool reliable_=true, const std::string &data_ = "") :
                id(id_),
                reliable(reliable_),
                datastring(data_)
@@ -63,8 +63,8 @@ class ActiveObject
                m_id(id)
        {
        }
-       
-       u16 getId()
+
+       u16 getId() const
        {
                return m_id;
        }
@@ -75,11 +75,29 @@ class ActiveObject
        }
 
        virtual ActiveObjectType getType() const = 0;
-       virtual bool getCollisionBox(aabb3f *toset) = 0;
-       virtual bool collideWithObjects() = 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
-