Mgv6 mudflow: Remove decoration if 'dirt with grass' below flows away (#5798)

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

diff --git a/src/activeobject.h b/src/activeobject.h
index 1a75fba2efb1f67bbf0ced2541d708b901240ebb..f349ddef35742cc5fb35b0ce023ec313dd63437a 100644 (file)
--- a/src/activeobject.h
+++ b/src/activeobject.h
@@ -20,15 +20,30 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef ACTIVEOBJECT_HEADER
 #define ACTIVEOBJECT_HEADER
 
-#include "irrlichttypes_bloated.h"
+#include "irr_aabb3d.h"
 #include <string>
 
-#define ACTIVEOBJECT_TYPE_INVALID 0
+enum ActiveObjectType {
+       ACTIVEOBJECT_TYPE_INVALID = 0,
+       ACTIVEOBJECT_TYPE_TEST = 1,
+// Deprecated stuff
+       ACTIVEOBJECT_TYPE_ITEM = 2,
+//     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,
+// Special type, only exists as CAO
+       ACTIVEOBJECT_TYPE_GENERIC = 101,
+};
 // Other types are defined in content_object.h
 
 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_)
@@ -49,7 +64,7 @@ public:
                m_id(id)
        {
        }
-       
+
        u16 getId()
        {
                return m_id;
@@ -60,8 +75,9 @@ public:
                m_id = id;
        }
 
-       virtual u8 getType() const = 0;
-       virtual bool getCollisionBox(aabb3f *toset) = 0;
+       virtual ActiveObjectType getType() const = 0;
+       virtual bool getCollisionBox(aabb3f *toset) const = 0;
+       virtual bool collideWithObjects() const = 0;
 protected:
        u16 m_id; // 0 is invalid, "no id"
 };