Pass clang-format on various cpp/header files (#5559)

[dragonfireclient.git] / src / activeobject.h

diff --git a/src/activeobject.h b/src/activeobject.h
index f4d721a552a09cba4c6fdfc2c60a2ea445ae3ea1..71b9df5147b545a7f3eb237eda5c987349134757 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 @@ class ActiveObject
                m_id(id)
        {
        }
-       
+
        u16 getId()
        {
                return m_id;
@@ -60,9 +75,9 @@ class ActiveObject
                m_id = id;
        }
 
-       virtual u8 getType() const = 0;
-       virtual bool getCollisionBox(aabb3f *toset) = 0;
-       virtual bool collideWithObjects() = 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"
 };