libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-05 00:36:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GOB: Rename Script::evalBoolResult() to Script::evalBool()

Browse Source 
svn-id: r55633
This commit is contained in:
Sven Hesse 2011-01-29 22:47:14 +00:00
parent b54416b46e
commit 40bf0286a1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/gob/inter_fascin.cpp
View File

@ -130,7 +130,7 @@ void Inter_Fascination::oFascin_repeatUntil(OpFuncParams &params) {
_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.

6
engines/gob/inter_v1.cpp
View File

@ -755,7 +755,7 @@ void Inter_v1::o1_repeatUntil(OpFuncParams &params) {
_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 &params) {
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 &params) {
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;

2
engines/gob/script.cpp
View File

@ -308,7 +308,7 @@ char Script::evalExpr(int16 *pRes) {
return type;
}
bool Script::evalBoolResult() {
bool Script::evalBool() {
byte type;
_expression->printExpr(99);

2
engines/gob/script.h
View File

@ -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;