[Scummvm-cvs-logs] SF.net SVN: scummvm:[55633] scummvm/trunk/engines/gob

[drmccoy at users.sourceforge.net]

Revision: 55633
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55633&view=rev
Author:   drmccoy
Date:     2011-01-29 22:47:14 +0000 (Sat, 29 Jan 2011)

Log Message:
-----------
GOB: Rename Script::evalBoolResult() to Script::evalBool()

Modified Paths:
--------------
    scummvm/trunk/engines/gob/inter_fascin.cpp
    scummvm/trunk/engines/gob/inter_v1.cpp
    scummvm/trunk/engines/gob/script.cpp
    scummvm/trunk/engines/gob/script.h

Modified: scummvm/trunk/engines/gob/inter_fascin.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_fascin.cpp	2011-01-29 22:46:41 UTC (rev 55632)
+++ scummvm/trunk/engines/gob/inter_fascin.cpp	2011-01-29 22:47:14 UTC (rev 55633)
@@ -130,7 +130,7 @@
 
 		_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.

Modified: scummvm/trunk/engines/gob/inter_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v1.cpp	2011-01-29 22:46:41 UTC (rev 55632)
+++ scummvm/trunk/engines/gob/inter_v1.cpp	2011-01-29 22:47:14 UTC (rev 55633)
@@ -755,7 +755,7 @@
 
 		_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 @@
 	do {
 		uint32 startPos = _vm->_game->_script->pos();
 
-		flag = _vm->_game->_script->evalBoolResult();
+		flag = _vm->_game->_script->evalBool();
 
 		if (_terminate)
 			return;
@@ -815,7 +815,7 @@
 		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;

Modified: scummvm/trunk/engines/gob/script.cpp
===================================================================
--- scummvm/trunk/engines/gob/script.cpp	2011-01-29 22:46:41 UTC (rev 55632)
+++ scummvm/trunk/engines/gob/script.cpp	2011-01-29 22:47:14 UTC (rev 55633)
@@ -308,7 +308,7 @@
 	return type;
 }
 
-bool Script::evalBoolResult() {
+bool Script::evalBool() {
 	byte type;
 
 	_expression->printExpr(99);

Modified: scummvm/trunk/engines/gob/script.h
===================================================================
--- scummvm/trunk/engines/gob/script.h	2011-01-29 22:46:41 UTC (rev 55632)
+++ scummvm/trunk/engines/gob/script.h	2011-01-29 22:47:14 UTC (rev 55633)
@@ -85,7 +85,7 @@
 
 	// Higher-level expression parsing functions
 	char evalExpr(int16 *pRes);
-	bool evalBoolResult();
+	bool evalBool();
 
 	// Accessing the result of expressions
 	int32 getResultInt() const;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.