[colobot] 154/377: Fixed failed assertion when damaging LRV or Scribbler, closes #665
Didier Raboud
odyx at moszumanska.debian.org
Wed Mar 30 13:34:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit 52a18de5c09a0e24ee3a380e197a22a433efcc30
Author: krzys-h <krzys_h at interia.pl>
Date: Sat Dec 19 22:19:13 2015 +0100
Fixed failed assertion when damaging LRV or Scribbler, closes #665
---
src/physics/physics.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp
index cd91f7d..7bab925 100644
--- a/src/physics/physics.cpp
+++ b/src/physics/physics.cpp
@@ -2750,9 +2750,7 @@ bool CPhysics::ExploOther(ObjectType iType,
oType == OBJECT_MOBILEwt ||
oType == OBJECT_MOBILEtt ||
oType == OBJECT_MOBILEft ||
- oType == OBJECT_MOBILEit ||
- oType == OBJECT_MOBILEdr ||
- oType == OBJECT_APOLLO2 ) // vehicle?
+ oType == OBJECT_MOBILEit ) // vehicle?
{
assert(pObj->Implements(ObjectInterfaceType::Damageable));
dynamic_cast<CDamageableObject*>(pObj)->DamageObject(DamageType::Collision, force/200.0f);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list