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

Fixed PowerCaptor not recharging transported objects, closes #594

master
krzys-h 2015-08-25 10:32:50 +02:00
parent 5a29bee3b4
commit b9e7143734
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/object/auto/autopowercaptor.cpp
View File

@ -272,7 +272,7 @@ void CAutoPowerCaptor::ChargeObject(float rTime)
CObject* power = dynamic_cast<CPoweredObject*>(obj)->GetPower();
if ( power != nullptr && power->Implements(ObjectInterfaceType::PowerContainer) )
{
CPowerContainerObject* powerContainer = dynamic_cast<CPowerContainerObject*>(obj);
CPowerContainerObject* powerContainer = dynamic_cast<CPowerContainerObject*>(power);
if (powerContainer->IsRechargeable())
{
float energy = powerContainer->GetEnergy();
@ -288,7 +288,7 @@ void CAutoPowerCaptor::ChargeObject(float rTime)
CObject* power = dynamic_cast<CCarrierObject*>(obj)->GetCargo();
if ( power != nullptr && power->Implements(ObjectInterfaceType::PowerContainer) )
{
CPowerContainerObject* powerContainer = dynamic_cast<CPowerContainerObject*>(obj);
CPowerContainerObject* powerContainer = dynamic_cast<CPowerContainerObject*>(power);
if (powerContainer->IsRechargeable())
{
float energy = powerContainer->GetEnergy();