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

Merge pull request #1497 from colobot/dev-fix-recharging 

Fix assert fail after PR#1444
fix-squashed-planets
Emxx52 2022-01-30 21:21:16 +01:00 committed by GitHub
parent cbc07c04a5 eff8e885d5
commit 85dc3f68e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/auto/autopowercaptor.cpp
View File

@ -269,7 +269,7 @@ void CAutoPowerCaptor::ChargeObject(float rTime)
if (obj->Implements(ObjectInterfaceType::Slotted)) if (obj->Implements(ObjectInterfaceType::Slotted))
{ {
CSlottedObject* slotted = dynamic_cast<CSlottedObject*>(obj); CSlottedObject* slotted = dynamic_cast<CSlottedObject*>(obj);
for (int slot = slotted->GetNumSlots(); slot >= 0; slot--) for (int slot = slotted->GetNumSlots() - 1; slot >= 0; slot--)
{ {
CObject *held = slotted->GetSlotContainedObject(slot); CObject *held = slotted->GetSlotContainedObject(slot);
if (held != nullptr && held->Implements(ObjectInterfaceType::PowerContainer)) if (held != nullptr && held->Implements(ObjectInterfaceType::PowerContainer))

2
src/object/auto/autopowerstation.cpp
View File

@ -134,7 +134,7 @@ bool CAutoPowerStation::EventProcess(const Event &event)
if (vehicle != nullptr && vehicle->Implements(ObjectInterfaceType::Slotted)) if (vehicle != nullptr && vehicle->Implements(ObjectInterfaceType::Slotted))
{ {
CSlottedObject* slotted = dynamic_cast<CSlottedObject*>(vehicle); CSlottedObject* slotted = dynamic_cast<CSlottedObject*>(vehicle);
for (int slot = slotted->GetNumSlots(); slot >= 0; slot--) for (int slot = slotted->GetNumSlots() - 1; slot >= 0; slot--)
{ {
CObject *power = slotted->GetSlotContainedObject(slot); CObject *power = slotted->GetSlotContainedObject(slot);
if (power != nullptr && power->Implements(ObjectInterfaceType::PowerContainer)) if (power != nullptr && power->Implements(ObjectInterfaceType::PowerContainer))