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

Fix mission end before astronaut death scene is finished (#848)

dev-buzzingcars
krzys-h 2016-12-27 15:32:38 +01:00
parent 5722fdb163
commit f33ffaf18b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/object/old_object.cpp
View File

@ -2654,7 +2654,10 @@ bool COldObject::IsDying()
bool COldObject::GetActive() 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() bool COldObject::GetDetectable()