projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Node highlighting.
[oweals/minetest.git]
/
src
/
activeobject.h
diff --git
a/src/activeobject.h
b/src/activeobject.h
index 1a75fba2efb1f67bbf0ced2541d708b901240ebb..46880fc7feb10819a775bc9c0cbee0ce8e7a0fb9 100644
(file)
--- a/
src/activeobject.h
+++ b/
src/activeobject.h
@@
-20,7
+20,7
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef ACTIVEOBJECT_HEADER
#define ACTIVEOBJECT_HEADER
#ifndef ACTIVEOBJECT_HEADER
#define ACTIVEOBJECT_HEADER
-#include "irr
lichttypes_bloate
d.h"
+#include "irr
_aabb3
d.h"
#include <string>
#define ACTIVEOBJECT_TYPE_INVALID 0
#include <string>
#define ACTIVEOBJECT_TYPE_INVALID 0
@@
-62,6
+62,7
@@
public:
virtual u8 getType() const = 0;
virtual bool getCollisionBox(aabb3f *toset) = 0;
virtual u8 getType() const = 0;
virtual bool getCollisionBox(aabb3f *toset) = 0;
+ virtual bool collideWithObjects() = 0;
protected:
u16 m_id; // 0 is invalid, "no id"
};
protected:
u16 m_id; // 0 is invalid, "no id"
};