diff options
| author | Sven Hesse | 2011-01-29 22:47:14 +0000 |
|---|---|---|
| committer | Sven Hesse | 2011-01-29 22:47:14 +0000 |
| commit | 40bf0286a1054b09eeb95445499518f7c84aaa04 (patch) | |
| tree | 2f9580c8a1bdffa61c9bf233a5a6b9d30b75a559 | |
| parent | b54416b46ee0d26fd39adbfcaba1a451f6293236 (diff) | |
| download | scummvm-rg350-40bf0286a1054b09eeb95445499518f7c84aaa04.tar.gz scummvm-rg350-40bf0286a1054b09eeb95445499518f7c84aaa04.tar.bz2 scummvm-rg350-40bf0286a1054b09eeb95445499518f7c84aaa04.zip | |
GOB: Rename Script::evalBoolResult() to Script::evalBool()
svn-id: r55633
| -rw-r--r-- | engines/gob/inter_fascin.cpp | 2 | ||||
| -rw-r--r-- | engines/gob/inter_v1.cpp | 6 | ||||
| -rw-r--r-- | engines/gob/script.cpp | 2 | ||||
| -rw-r--r-- | engines/gob/script.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/engines/gob/inter_fascin.cpp b/engines/gob/inter_fascin.cpp index 51f4f92663..5e820cef02 100644 --- a/engines/gob/inter_fascin.cpp +++ b/engines/gob/inter_fascin.cpp @@ -130,7 +130,7 @@ void Inter_Fascination::oFascin_repeatUntil(OpFuncParams ¶ms) { _vm->_game->_script->seek(blockPos + size + 1); - flag = _vm->_game->_script->evalBoolResult(); + flag = _vm->_game->_script->evalBool(); // WORKAROUND: The script of the PC version of Fascination, when the protection check // fails, writes on purpose everywhere in the memory in order to hang the computer. diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp index 23f9ea0a10..a908758500 100644 --- a/engines/gob/inter_v1.cpp +++ b/engines/gob/inter_v1.cpp @@ -755,7 +755,7 @@ void Inter_v1::o1_repeatUntil(OpFuncParams ¶ms) { _vm->_game->_script->seek(blockPos + size + 1); - flag = _vm->_game->_script->evalBoolResult(); + flag = _vm->_game->_script->evalBool(); } while (!flag && !_break && !_terminate && !_vm->shouldQuit()); _nestLevel[0]--; @@ -774,7 +774,7 @@ void Inter_v1::o1_whileDo(OpFuncParams ¶ms) { do { uint32 startPos = _vm->_game->_script->pos(); - flag = _vm->_game->_script->evalBoolResult(); + flag = _vm->_game->_script->evalBool(); if (_terminate) return; @@ -815,7 +815,7 @@ void Inter_v1::o1_if(OpFuncParams ¶ms) { WRITE_VAR(285, 0); } - boolRes = _vm->_game->_script->evalBoolResult(); + boolRes = _vm->_game->_script->evalBool(); if (boolRes) { if ((params.counter == params.cmdCount) && (params.retFlag == 2)) { params.doReturn = true; diff --git a/engines/gob/script.cpp b/engines/gob/script.cpp index 0b0fcd4cda..fd67a70cba 100644 --- a/engines/gob/script.cpp +++ b/engines/gob/script.cpp @@ -308,7 +308,7 @@ char Script::evalExpr(int16 *pRes) { return type; } -bool Script::evalBoolResult() { +bool Script::evalBool() { byte type; _expression->printExpr(99); diff --git a/engines/gob/script.h b/engines/gob/script.h index cf9eb246ce..ffdb4d6340 100644 --- a/engines/gob/script.h +++ b/engines/gob/script.h @@ -85,7 +85,7 @@ public: // Higher-level expression parsing functions char evalExpr(int16 *pRes); - bool evalBoolResult(); + bool evalBool(); // Accessing the result of expressions int32 getResultInt() const; |