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

Fix delete() not returning sometimes, closes #1067

1008-fix
krzys-h 2018-05-09 23:12:26 +02:00
parent 10fc47476b
commit 319d8e6854
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/object/object_manager.cpp
View File

@ -71,7 +71,7 @@ bool CObjectManager::DeleteObject(CObject* instance)
it->second.reset(); it->second.reset();
m_shouldCleanRemovedObjects = true; m_shouldCleanRemovedObjects = true;
return true; return true;
} } else assert(false);
return false; return false;
} }

2
src/script/scriptfunc.cpp
View File

@ -657,7 +657,7 @@ bool CScriptFunctions::rDelete(CBotVar* var, CBotVar* result, int& exception, vo
} }
CObject* obj = CObjectManager::GetInstancePointer()->GetObjectById(rank); CObject* obj = CObjectManager::GetInstancePointer()->GetObjectById(rank);
if ( obj == nullptr ) if ( obj == nullptr || (obj->Implements(ObjectInterfaceType::Old) && dynamic_cast<COldObject*>(obj)->IsDying()) )
{ {
return true; return true;
} }