diff options
| author | Oleg Kosmakov <kosmakoff@gmail.com> | 2014-03-21 13:18:28 +0200 |
|---|---|---|
| committer | Oleg Kosmakov <kosmakoff@gmail.com> | 2014-03-21 13:18:28 +0200 |
| commit | 119fce546a993bdb3640234a04a365bbda1d1053 (patch) | |
| tree | 8b10c1020d766dc2de0574155d849d9b1f0bc02b /src/script | |
| parent | 4491f51839a8d6806d27cc50bbb6e285205e3d24 (diff) | |
| download | colobot-119fce546a993bdb3640234a04a365bbda1d1053.tar.gz colobot-119fce546a993bdb3640234a04a365bbda1d1053.tar.bz2 colobot-119fce546a993bdb3640234a04a365bbda1d1053.zip | |
Issue #295 - continue
Renamed the method, fixed typo in comments
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/script.cpp | 6 | ||||
| -rw-r--r-- | src/script/script.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/script/script.cpp b/src/script/script.cpp index d55c4d1..ca3f4e1 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -1393,7 +1393,7 @@ bool CScript::Process(CScript* script, CBotVar* result, int &exception) if ( err == ERR_STOP ) err = ERR_OK; result->SetValInt(err); // indicates the error or ok - if ( ShouldExecutionStop(err, script->m_errMode) ) + if ( ShouldProcessStop(err, script->m_errMode) ) { exception = err; 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 if (err == ERR_AIM_IMPOSSIBLE) diff --git a/src/script/script.h b/src/script/script.h index 694228a..fb44342 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -211,7 +211,7 @@ public: private: 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); protected: |