diff options
| author | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
| commit | a0566270d9fa075afa36a7e3e68c690b1b23ba90 (patch) | |
| tree | 6bc88127ee67b7bf4d6a2d6f9d0a9e5f997d1dd1 /src/activeobject.h | |
| parent | 0d83bdc3aa9f1077836aacb833ac4ad9bbb9a4f4 (diff) | |
| parent | 1aa50b13622c1e264044839ecdf0152670dae6ce (diff) | |
| download | minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.gz minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.bz2 minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/activeobject.h')
| -rw-r--r-- | src/activeobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeobject.h b/src/activeobject.h index e454f2c8c..1a75fba2e 100644 --- a/src/activeobject.h +++ b/src/activeobject.h @@ -61,7 +61,7 @@ public: } virtual u8 getType() const = 0; - + virtual bool getCollisionBox(aabb3f *toset) = 0; protected: u16 m_id; // 0 is invalid, "no id" }; |