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

Fixed astronaut death bug 

introduced in f7d2f501bb
master
krzys-h 2015-08-13 22:27:10 +02:00
parent b832200798
commit 74609d9bea
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/object/old_object.cpp
View File

@ -1936,7 +1936,7 @@ void COldObject::UpdateEnergyMapping()
bool COldObject::EventProcess(const Event &event) bool COldObject::EventProcess(const Event &event)
{ {
// NOTE: This should be called befoce CProgrammableObjectImpl::EventProcess, see the other note inside this function // NOTE: This should be called befoce CProgrammableObjectImpl::EventProcess, see the other note inside this function
if (!CTaskExecutorObjectImpl::EventProcess(event)) return true; if (!CTaskExecutorObjectImpl::EventProcess(event)) return false;
if ( m_physics != nullptr ) if ( m_physics != nullptr )
{ {
@ -2088,7 +2088,7 @@ bool COldObject::EventProcess(const Event &event)
if (!m_motion->EventProcess(event)) return false; if (!m_motion->EventProcess(event)) return false;
} }
if (!CProgrammableObjectImpl::EventProcess(event)) return true; if (!CProgrammableObjectImpl::EventProcess(event)) return false;
if ( event.type == EVENT_FRAME ) if ( event.type == EVENT_FRAME )
{ {
@ -3392,7 +3392,10 @@ void COldObject::StopProgram()
m_physics->SetMotorSpeedY(0.0f); m_physics->SetMotorSpeedY(0.0f);
m_physics->SetMotorSpeedZ(0.0f); m_physics->SetMotorSpeedZ(0.0f);
m_motion->SetAction(-1); if (m_type != OBJECT_HUMAN) // Be sure not to stop the death animation!
{
m_motion->SetAction(-1);
}
} }
// State management of the pencil drawing robot. // State management of the pencil drawing robot.