X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Factiveobject.h;h=b6a0e67af37e51603c0a53ef584f6ff04f163346;hb=d6050bee5187d0d456e9d95406fc74ba163ea3aa;hp=1a16aa0c43b5a890c7d2585e66d44c7804607b68;hpb=e4f7f97e6c79cda72dec7cd6fea5b85328b75894;p=oweals%2Fminetest.git

diff --git a/src/activeobject.h b/src/activeobject.h
index 1a16aa0c4..b6a0e67af 100644
--- a/src/activeobject.h
+++ b/src/activeobject.h
@@ -1,31 +1,48 @@
 /*
-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.
 */
 
-#ifndef ACTIVEOBJECT_HEADER
-#define ACTIVEOBJECT_HEADER
+#pragma once
 
-#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,9 +53,6 @@ struct ActiveObjectMessage
 	std::string datastring;
 };
 
-#define ACTIVEOBJECT_TYPE_INVALID 0
-#define ACTIVEOBJECT_TYPE_TEST 1
-
 /*
 	Parent class for ServerActiveObject and ClientActiveObject
 */
@@ -49,8 +63,8 @@ public:
 		m_id(id)
 	{
 	}
-	
-	u16 getId()
+
+	u16 getId() const
 	{
 		return m_id;
 	}
@@ -60,11 +74,30 @@ public:
 		m_id = id;
 	}
 
-	virtual u8 getType() const = 0;
+	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"
 };
-
-#endif
-