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

Made powermin and powermax work with cells that are not in bot's power slot

master
krzys-h 2015-03-28 12:21:56 +01:00
parent 14068ce54b
commit 72196b252c
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/object/robotmain.cpp
View File

@ -5429,6 +5429,12 @@ void CRobotMain::UpdateAudio(bool frame)
{
energyLevel = power->GetEnergy();
if (power->GetType() == OBJECT_ATOMIC) energyLevel *= 100;
} else {
if(obj->GetType() == OBJECT_POWER || obj->GetType() == OBJECT_ATOMIC)
{
energyLevel = obj->GetEnergy();
if (obj->GetType() == OBJECT_ATOMIC) energyLevel *= 100;
}
}
if (energyLevel < m_audioChange[t].powermin || energyLevel > m_audioChange[t].powermax)
continue;
@ -5553,6 +5559,12 @@ Error CRobotMain::CheckEndMission(bool frame)
{
energyLevel = power->GetEnergy();
if (power->GetType() == OBJECT_ATOMIC) energyLevel *= 100;
} else {
if(obj->GetType() == OBJECT_POWER || obj->GetType() == OBJECT_ATOMIC)
{
energyLevel = obj->GetEnergy();
if (obj->GetType() == OBJECT_ATOMIC) energyLevel *= 100;
}
}
if (energyLevel < m_endTake[t].powermin || energyLevel > m_endTake[t].powermax) continue;