immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed AlienWorm collisions (#740)

dev-time-step
krzys-h 2016-04-07 20:30:25 +02:00
parent 0d12dedd90
commit ac950978a9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/object/object.cpp
View File

@ -114,7 +114,8 @@ std::vector<CrashSphere> CObject::GetAllCrashSpheres()
bool CObject::CanCollideWith(CObject* other) bool CObject::CanCollideWith(CObject* other)
{ {
ObjectType otherType = other->GetType(); 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 (m_type == OBJECT_MOTHER)
{ {
if (otherType == OBJECT_ANT) return false; if (otherType == OBJECT_ANT) return false;