[colobot] 31/100: Fix mission end before astronaut death scene is finished (#848)

[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 f33ffaf18b57f98e2bbc83ad0452e036b4929041
Author: krzys-h <krzys_h at interia.pl>
Date:   Tue Dec 27 15:32:38 2016 +0100

    Fix mission end before astronaut death scene is finished (#848)
---
 src/object/old_object.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/object/old_object.cpp b/src/object/old_object.cpp
index c893742..1f2f6e2 100644
--- a/src/object/old_object.cpp
+++ b/src/object/old_object.cpp
@@ -2654,7 +2654,10 @@ bool COldObject::IsDying()
 
 bool COldObject::GetActive()
 {
-    return !GetLock() && !(Implements(ObjectInterfaceType::Destroyable) && IsDying()) && !m_bFlat;
+    // Dying astronaut (m_dying == DeathType::Dead) should be treated as active
+    // This is for EndMissionTake to not detect him as actually dead until the animation is finished
+
+    return !GetLock() && !(Implements(ObjectInterfaceType::Destroyable) && IsDying() && GetDying() != DeathType::Dead) && !m_bFlat;
 }
 
 bool COldObject::GetDetectable()

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