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

Whitespace

dev-ui
Oleg Kosmakov 2014-03-21 13:22:02 +02:00
parent 119fce546a
commit a2a4eb75cb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/script/script.cpp
View File

@ -1412,10 +1412,10 @@ bool CScript::Process(CScript* script, CBotVar* result, int &exception)
bool CScript::ShouldProcessStop(Error err, int errMode) bool CScript::ShouldProcessStop(Error err, int errMode)
{ {
// aim impossible - not a real error // aim impossible - not a real error
if (err == ERR_AIM_IMPOSSIBLE) if ( err == ERR_AIM_IMPOSSIBLE )
return false; return false;
if (err != ERR_OK && errMode == ERM_STOP) if ( err != ERR_OK && errMode == ERM_STOP )
return true; return true;
return false; return false;
@ -2969,7 +2969,7 @@ bool CScript::rAim(CBotVar* var, CBotVar* result, int& exception, void* user)
var = var->GetNext(); var = var->GetNext();
var == 0 ? y=0.0f : y=var->GetValFloat(); var == 0 ? y=0.0f : y=var->GetValFloat();
err = script->m_primaryTask->StartTaskGunGoal(x*Math::PI/180.0f, y*Math::PI/180.0f); err = script->m_primaryTask->StartTaskGunGoal(x*Math::PI/180.0f, y*Math::PI/180.0f);
if (err == ERR_AIM_IMPOSSIBLE) if ( err == ERR_AIM_IMPOSSIBLE )
{ {
result->SetValInt(err); // shows the error result->SetValInt(err); // shows the error
} }