X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Factiveobject.h;h=46880fc7feb10819a775bc9c0cbee0ce8e7a0fb9;hb=55c646c5c2b40931d24be8541b3056ab3322a70f;hp=382f7f7981d329a3b751da08e44362b5f3a50df2;hpb=c638442e78b953556e7dadd4c0c34cb0c719bbc8;p=oweals%2Fminetest.git diff --git a/src/activeobject.h b/src/activeobject.h index 382f7f798..46880fc7f 100644 --- a/src/activeobject.h +++ b/src/activeobject.h @@ -1,18 +1,18 @@ /* -Minetest-c55 -Copyright (C) 2010-2011 celeron55, Perttu Ahola +Minetest +Copyright (C) 2010-2013 celeron55, Perttu Ahola 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,9 +20,12 @@ 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 +#define ACTIVEOBJECT_TYPE_INVALID 0 +// Other types are defined in content_object.h + struct ActiveObjectMessage { ActiveObjectMessage(u16 id_, bool reliable_=true, std::string data_=""): @@ -36,12 +39,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 */ @@ -64,7 +61,8 @@ public: } virtual u8 getType() const = 0; - + virtual bool getCollisionBox(aabb3f *toset) = 0; + virtual bool collideWithObjects() = 0; protected: u16 m_id; // 0 is invalid, "no id" };