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 382f7f7981d329a3b751da08e44362b5f3a50df2..71b9df5147b545a7f3eb237eda5c987349134757 100644 (file)
--- a/src/activeobject.h
+++ b/src/activeobject.h
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -20,12 +20,30 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef ACTIVEOBJECT_HEADER
 #define ACTIVEOBJECT_HEADER
 
-#include "common_irrlicht.h"
+#include "irr_aabb3d.h"
 #include <string>
 
+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_)
@@ -36,12 +54,6 @@ struct ActiveObjectMessage
        std::string datastring;
 };
 
-#define ACTIVEOBJECT_TYPE_INVALID 0
-#define ACTIVEOBJECT_TYPE_TEST 1
-#define ACTIVEOBJECT_TYPE_ITEM 2
-#define ACTIVEOBJECT_TYPE_RAT 3
-#define ACTIVEOBJECT_TYPE_OERKKI1 4
-
 /*
        Parent class for ServerActiveObject and ClientActiveObject
 */
@@ -52,7 +64,7 @@ class ActiveObject
                m_id(id)
        {
        }
-       
+
        u16 getId()
        {
                return m_id;
@@ -63,8 +75,9 @@ class ActiveObject
                m_id = id;
        }
 
-       virtual u8 getType() const = 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"
 };