diff options
| author | SmallJoker <SmallJoker@users.noreply.github.com> | 2018-08-05 22:28:41 +0200 |
|---|---|---|
| committer | Paramat <paramat@users.noreply.github.com> | 2018-08-05 21:28:41 +0100 |
| commit | ee63b94f2c9e176f549c4446391e4c59f5a5be53 (patch) | |
| tree | 767f643bf1849b521646ed0ca41c323efd384a7a /src/content_cao.h | |
| parent | 88efebdf864baeb422cbe4d992a44ff7c99373fb (diff) | |
| download | minetest-ee63b94f2c9e176f549c4446391e4c59f5a5be53.tar.gz minetest-ee63b94f2c9e176f549c4446391e4c59f5a5be53.tar.bz2 minetest-ee63b94f2c9e176f549c4446391e4c59f5a5be53.zip | |
Prevent objects from colliding with own child attachments (#7610)
Also, use a better distance calculation for 'collide with objects'.
Fixes the issue of a vehicle occasionally colliding with its own driver,
causing one of the velocity components to be set to zero.
Diffstat (limited to 'src/content_cao.h')
| -rw-r--r-- | src/content_cao.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/content_cao.h b/src/content_cao.h index cd58681bb..9e688d78d 100644 --- a/src/content_cao.h +++ b/src/content_cao.h @@ -139,8 +139,6 @@ public: void processInitData(const std::string &data); - ClientActiveObject *getParent() const; - bool getCollisionBox(aabb3f *toset) const; bool collideWithObjects() const; @@ -181,6 +179,8 @@ public: void setChildrenVisible(bool toset); + ClientActiveObject *getParent() const; + void setAttachments(); void removeFromScene(bool permanent); |