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

Issue #295 - continue 

Renamed the method, fixed typo in comments
dev-ui
Oleg Kosmakov 2014-03-21 13:18:28 +02:00
parent 4491f51839
commit 119fce546a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/script/script.cpp
View File

@ -1393,7 +1393,7 @@ bool CScript::Process(CScript* script, CBotVar* result, int &exception)
if ( err == ERR_STOP ) err = ERR_OK; if ( err == ERR_STOP ) err = ERR_OK;
result->SetValInt(err); // indicates the error or ok result->SetValInt(err); // indicates the error or ok
if ( ShouldExecutionStop(err, script->m_errMode) ) if ( ShouldProcessStop(err, script->m_errMode) )
{ {
exception = err; exception = err;
return false; return false;
@ -1407,9 +1407,9 @@ bool CScript::Process(CScript* script, CBotVar* result, int &exception)
} }
// Returns true if error code means rela error and exception must be thrown // Returns true if error code means real error and exception must be thrown
bool CScript::ShouldExecutionStop(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)

2
src/script/script.h
View File

@ -211,7 +211,7 @@ public:
private: private:
static bool Process(CScript* script, CBotVar* result, int &exception); static bool Process(CScript* script, CBotVar* result, int &exception);
static bool ShouldExecutionStop(Error err, int errMode); static bool ShouldProcessStop(Error err, int errMode);
static CObject* SearchInfo(CScript* script, CObject* object, float power); static CObject* SearchInfo(CScript* script, CObject* object, float power);
protected: protected: