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/clientobject.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/clientobject.h')
-rw-r--r-- | src/clientobject.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/clientobject.h b/src/clientobject.h index c85e1ec91..9377d1e67 100644 --- a/src/clientobject.h +++ b/src/clientobject.h @@ -51,6 +51,7 @@ public: virtual scene::ISceneNode *getSceneNode() { return NULL; } virtual scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode() { return NULL; } virtual bool isLocalPlayer() const {return false;} + virtual ClientActiveObject *getParent() const { return nullptr; }; virtual void setAttachments() {} virtual bool doShowSelectionBox(){return true;} |