Fix merge mistake when rebasing for PR #1169

[minetest.git] / src / activeobject.h

diff --git a/src/activeobject.h b/src/activeobject.h
index 6c82034900ca8a0b33462bc9e1e25b118cbb112b..46880fc7feb10819a775bc9c0cbee0ce8e7a0fb9 100644 (file)
--- a/src/activeobject.h
+++ b/src/activeobject.h
@@ -1,6 +1,6 @@
 /*
-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 Lesser General Public License as published by
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef ACTIVEOBJECT_HEADER
 #define ACTIVEOBJECT_HEADER
 
-#include "irrlichttypes.h"
+#include "irr_aabb3d.h"
 #include <string>
 
 #define ACTIVEOBJECT_TYPE_INVALID 0
@@ -61,7 +61,8 @@ class ActiveObject
        }
 
        virtual u8 getType() const = 0;
-
+       virtual bool getCollisionBox(aabb3f *toset) = 0;
+       virtual bool collideWithObjects() = 0;
 protected:
        u16 m_id; // 0 is invalid, "no id"
 };