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

Fix crash when replacing power cell

master
Piotr Dziwinski 2015-07-12 13:19:41 +02:00
parent a1e5812740
commit fdb594b9f7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/object/task/tasktake.cpp
View File

@ -529,10 +529,10 @@ bool CTaskTake::TransporterDeposeObject()
CObject* cargo = dynamic_cast<CPoweredObject*>(other)->GetPower(); CObject* cargo = dynamic_cast<CPoweredObject*>(other)->GetPower();
if (cargo != nullptr) return false; // the other already has a battery? if (cargo != nullptr) return false; // the other already has a battery?
assert(cargo->Implements(ObjectInterfaceType::Transportable));
cargo = m_carrierObject->GetCargo(); cargo = m_carrierObject->GetCargo();
if (cargo == nullptr) return false; if (cargo == nullptr) return false;
assert(cargo->Implements(ObjectInterfaceType::Transportable));
m_cargoType = cargo->GetType(); m_cargoType = cargo->GetType();
dynamic_cast<CPoweredObject*>(other)->SetPower(cargo); dynamic_cast<CPoweredObject*>(other)->SetPower(cargo);