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

Fixed DefenseTower empty cell detection (#378)

dev-mp
krzys-h 2014-11-10 19:38:11 +01:00
parent b6eec3d8c6
commit a952e0ec54
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/object/auto/autotower.cpp
View File

@ -134,7 +134,7 @@ bool CAutoTower::EventProcess(const Event &event)
power = m_object->GetPower(); power = m_object->GetPower();
if ( power != 0 ) if ( power != 0 )
{ {
energy = power->GetEnergy(); energy = power->GetEnergy()*power->GetCapacity();
} }
if ( energy >= ENERGY_FIRE ) if ( energy >= ENERGY_FIRE )
{ {
@ -174,7 +174,7 @@ bool CAutoTower::EventProcess(const Event &event)
power = m_object->GetPower(); power = m_object->GetPower();
if ( power != 0 ) if ( power != 0 )
{ {
energy = power->GetEnergy(); energy = power->GetEnergy()*power->GetCapacity();
} }
target = SearchTarget(m_targetPos); target = SearchTarget(m_targetPos);
@ -329,13 +329,13 @@ Error CAutoTower::GetError()
} }
power = m_object->GetPower(); power = m_object->GetPower();
if ( power == 0 ) if ( power == nullptr )
{ {
return ERR_TOWER_POWER; // no battery return ERR_TOWER_POWER; // no battery
} }
else else
{ {
if ( power->GetEnergy() < ENERGY_FIRE ) if ( power->GetEnergy()*power->GetCapacity() < ENERGY_FIRE )
{ {
return ERR_TOWER_ENERGY; // not enough energy return ERR_TOWER_ENERGY; // not enough energy
} }