[colobot] 51/145: Fixed AlienWorm collisions (#740)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit ac950978a9042b73533694a389e5723400283282
Author: krzys-h <krzys_h at interia.pl>
Date:   Thu Apr 7 20:30:25 2016 +0200

    Fixed AlienWorm collisions (#740)
---
 src/object/object.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/object/object.cpp b/src/object/object.cpp
index 4446601..6685dd3 100644
--- a/src/object/object.cpp
+++ b/src/object/object.cpp
@@ -114,7 +114,8 @@ std::vector<CrashSphere> CObject::GetAllCrashSpheres()
 bool CObject::CanCollideWith(CObject* other)
 {
     ObjectType otherType = other->GetType();
-    if (m_type == OBJECT_WORM) return otherType == OBJECT_WORM;
+    if (m_type == OBJECT_WORM) return false;
+    if (otherType == OBJECT_WORM) return false;
     if (m_type == OBJECT_MOTHER)
     {
         if (otherType == OBJECT_ANT) return false;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git