Renaming _inter_resVal to _resultInt

svn-id: r41574

6 files changed, 33 insertions, 33 deletions

diff --git a/engines/gob/inter.cpp b/engines/gob/inter.cpp
index f9066f7dfe..82beaf9e42 100644
--- a/engines/gob/inter.cpp
+++ b/engines/gob/inter.cpp
@@ -100,7 +100,7 @@ char Inter::evalExpr(int16 *pRes) {
 
 	switch (type) {
 	case TYPE_IMM_INT16:
-		*pRes = _vm->_parse->_inter_resVal;
+		*pRes = _vm->_parse->_resultInt;
 		break;
 
 	case TYPE_IMM_STR:
@@ -123,7 +123,7 @@ bool Inter::evalBoolResult() {
 
 	_vm->_parse->parseExpr(99, &type);
 	if ( (type == GOB_TRUE) ||
-	    ((type == TYPE_IMM_INT16) && _vm->_parse->_inter_resVal))
+	    ((type == TYPE_IMM_INT16) && _vm->_parse->_resultInt))
 		return true;
 	else
 		return false;
diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp
index 7571f6d10b..c2537d7eeb 100644
--- a/engines/gob/inter_v1.cpp
+++ b/engines/gob/inter_v1.cpp
@@ -738,7 +738,7 @@ void Inter_v1::checkSwitchTable(byte **ppExec) {
 			if (_terminate)
 				return;
 
-			if (_vm->_parse->_inter_resVal == value) {
+			if (_vm->_parse->_resultInt == value) {
 				found = true;
 				notFound = false;
 			}
@@ -1332,7 +1332,7 @@ bool Inter_v1::o1_assign(OpFuncParams &params) {
 	switch (destType) {
 	case TYPE_VAR_INT32:
 	case TYPE_ARRAY_INT32:
-		WRITE_VAR_OFFSET(dest, _vm->_parse->_inter_resVal);
+		WRITE_VAR_OFFSET(dest, _vm->_parse->_resultInt);
 		break;
 
 	case TYPE_VAR_STR:
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp
index 293d014065..86598dde30 100644
--- a/engines/gob/inter_v2.cpp
+++ b/engines/gob/inter_v2.cpp
@@ -760,7 +760,7 @@ void Inter_v2::checkSwitchTable(byte **ppExec) {
 			default:
 				if (!found) {
 					evalExpr(0);
-					if (value == _vm->_parse->_inter_resVal)
+					if (value == _vm->_parse->_resultInt)
 						found = true;
 				} else
 					_vm->_parse->skipExpr(99);
@@ -1168,9 +1168,9 @@ void Inter_v2::o2_pushVars() {
 
 		} else {
 			if (evalExpr(&varOff) != 20)
-				_vm->_parse->_inter_resVal = 0;
+				_vm->_parse->_resultInt = 0;
 
-			memcpy(_varStack + _varStackPos, &_vm->_parse->_inter_resVal, 4);
+			memcpy(_varStack + _varStackPos, &_vm->_parse->_resultInt, 4);
 			_varStackPos += 4;
 			_varStack[_varStackPos] = 4;
 		}
@@ -1606,21 +1606,21 @@ bool Inter_v2::o2_assign(OpFuncParams &params) {
 		switch (destType) {
 		case TYPE_VAR_INT8:
 		case TYPE_ARRAY_INT8:
-			WRITE_VARO_UINT8(dest + i, _vm->_parse->_inter_resVal);
+			WRITE_VARO_UINT8(dest + i, _vm->_parse->_resultInt);
 			break;
 
 		case TYPE_VAR_INT16:
 		case TYPE_ARRAY_INT16:
-			WRITE_VARO_UINT16(dest + i * 2, _vm->_parse->_inter_resVal);
+			WRITE_VARO_UINT16(dest + i * 2, _vm->_parse->_resultInt);
 			break;
 
 		case TYPE_VAR_INT32:
 		case TYPE_ARRAY_INT32:
-			WRITE_VAR_OFFSET(dest + i * 4, _vm->_parse->_inter_resVal);
+			WRITE_VAR_OFFSET(dest + i * 4, _vm->_parse->_resultInt);
 			break;
 
 		case TYPE_VAR_INT32_AS_INT16:
-			WRITE_VARO_UINT16(dest + i * 4, _vm->_parse->_inter_resVal);
+			WRITE_VARO_UINT16(dest + i * 4, _vm->_parse->_resultInt);
 			break;
 
 		case TYPE_VAR_STR:
@@ -1897,7 +1897,7 @@ bool Inter_v2::o2_readData(OpFuncParams &params) {
 	dataVar = _vm->_parse->parseVarIndex();
 	size = _vm->_parse->parseValExpr();
 	evalExpr(0);
-	offset = _vm->_parse->_inter_resVal;
+	offset = _vm->_parse->_resultInt;
 	retSize = 0;
 
 	debugC(2, kDebugFileIO, "Read from file \"%s\" (%d, %d bytes at %d)",
@@ -1968,7 +1968,7 @@ bool Inter_v2::o2_writeData(OpFuncParams &params) {
 	dataVar = _vm->_parse->parseVarIndex();
 	size = _vm->_parse->parseValExpr();
 	evalExpr(0);
-	offset = _vm->_parse->_inter_resVal;
+	offset = _vm->_parse->_resultInt;
 
 	debugC(2, kDebugFileIO, "Write to file \"%s\" (%d, %d bytes at %d)",
 			_vm->_parse->_inter_resStr, dataVar, size, offset);
diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp
index 5a8393910f..d6a4addf5c 100644
--- a/engines/gob/inter_v6.cpp
+++ b/engines/gob/inter_v6.cpp
@@ -890,21 +890,21 @@ bool Inter_v6::o6_assign(OpFuncParams &params) {
 		switch (destType) {
 		case TYPE_VAR_INT8:
 		case TYPE_ARRAY_INT8:
-			WRITE_VARO_UINT8(dest + i, _vm->_parse->_inter_resVal);
+			WRITE_VARO_UINT8(dest + i, _vm->_parse->_resultInt);
 			break;
 
 		case TYPE_VAR_INT16:
 		case TYPE_ARRAY_INT16:
-			WRITE_VARO_UINT16(dest + i * 2, _vm->_parse->_inter_resVal);
+			WRITE_VARO_UINT16(dest + i * 2, _vm->_parse->_resultInt);
 			break;
 
 		case TYPE_VAR_INT32:
 		case TYPE_ARRAY_INT32:
-			WRITE_VAR_OFFSET(dest + i * 4, _vm->_parse->_inter_resVal);
+			WRITE_VAR_OFFSET(dest + i * 4, _vm->_parse->_resultInt);
 			break;
 
 		case TYPE_VAR_INT32_AS_INT16:
-			WRITE_VARO_UINT16(dest + i * 4, _vm->_parse->_inter_resVal);
+			WRITE_VARO_UINT16(dest + i * 4, _vm->_parse->_resultInt);
 			break;
 
 		case TYPE_VAR_STR:
@@ -979,8 +979,8 @@ bool Inter_v6::o6_fillRect(OpFuncParams &params) {
 
 	evalExpr(0);
 
-	_vm->_draw->_backColor = _vm->_parse->_inter_resVal & 0xFFFF;
-	uint16 extraVar = _vm->_parse->_inter_resVal >> 16;
+	_vm->_draw->_backColor = _vm->_parse->_resultInt & 0xFFFF;
+	uint16 extraVar = _vm->_parse->_resultInt >> 16;
 
 	if (extraVar != 0)
 		warning("Urban Stub: o6_fillRect(), extraVar = %d", extraVar);
diff --git a/engines/gob/parse.cpp b/engines/gob/parse.cpp
index 22e97c86b3..f5c766ed3e 100644
--- a/engines/gob/parse.cpp
+++ b/engines/gob/parse.cpp
@@ -35,7 +35,7 @@ namespace Gob {
 
 Parse::Parse(GobEngine *vm) : _vm(vm) {
 	_inter_resStr[0] = 0;
-	_inter_resVal = 0;
+	_resultInt = 0;
 }
 
 int32 Parse::encodePtr(byte *ptr, int type) {
@@ -623,7 +623,7 @@ int16 Parse::parseVarIndex(uint16 *size, uint16 *type) {
 int16 Parse::parseValExpr(byte stopToken) {
 	parseExpr(stopToken, 0);
 
-	return _vm->_parse->_inter_resVal;
+	return _vm->_parse->_resultInt;
 }
 
 // Load a value according to the operation
@@ -742,29 +742,29 @@ void Parse::loadValue(byte operation, uint32 varBase, byte *operPtr, int32 *valP
 			do {
 				prevPrevVal = prevVal;
 				prevVal = curVal;
-				curVal = (curVal + _vm->_parse->_inter_resVal / curVal) / 2;
+				curVal = (curVal + _vm->_parse->_resultInt / curVal) / 2;
 			} while ((curVal != prevVal) && (curVal != prevPrevVal));
-			_vm->_parse->_inter_resVal = curVal;
+			_vm->_parse->_resultInt = curVal;
 			break;
 
 		case FUNC_SQR:
-			_vm->_parse->_inter_resVal =
-				_vm->_parse->_inter_resVal * _vm->_parse->_inter_resVal;
+			_vm->_parse->_resultInt =
+				_vm->_parse->_resultInt * _vm->_parse->_resultInt;
 			break;
 
 		case FUNC_ABS:
-			if (_vm->_parse->_inter_resVal < 0)
-				_vm->_parse->_inter_resVal = -_vm->_parse->_inter_resVal;
+			if (_vm->_parse->_resultInt < 0)
+				_vm->_parse->_resultInt = -_vm->_parse->_resultInt;
 			break;
 
 		case FUNC_RAND:
-			_vm->_parse->_inter_resVal =
-				_vm->_util->getRandom(_vm->_parse->_inter_resVal);
+			_vm->_parse->_resultInt =
+				_vm->_util->getRandom(_vm->_parse->_resultInt);
 			break;
 		}
 
 		*operPtr = OP_LOAD_IMM_INT16;
-		*valPtr = _vm->_parse->_inter_resVal;
+		*valPtr = _vm->_parse->_resultInt;
 		break;
 	}
 }
@@ -1008,7 +1008,7 @@ void Parse::getResult(byte operation, int32 value, byte *type) {
 		break;
 
 	case OP_LOAD_IMM_INT16:
-		_vm->_parse->_inter_resVal = value;
+		_vm->_parse->_resultInt = value;
 		break;
 
 	case OP_LOAD_IMM_STR:
@@ -1021,7 +1021,7 @@ void Parse::getResult(byte operation, int32 value, byte *type) {
 		break;
 
 	default:
-		_vm->_parse->_inter_resVal = 0;
+		_vm->_parse->_resultInt = 0;
 		if (type != 0)
 			*type = OP_LOAD_IMM_INT16;
 		break;
diff --git a/engines/gob/parse.h b/engines/gob/parse.h
index 4c200236f6..dc95e71c02 100644
--- a/engines/gob/parse.h
+++ b/engines/gob/parse.h
@@ -119,7 +119,7 @@ public:
 	virtual ~Parse() {}
 
 	char _inter_resStr[200];
-	int32 _inter_resVal;
+	int32 _resultInt;
 
 private:
 	enum PointerType {