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

[drmccoy at users.sourceforge.net]

Revision: 41645
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41645&view=rev
Author:   drmccoy
Date:     2009-06-18 21:08:51 +0000 (Thu, 18 Jun 2009)

Log Message:
-----------
Removing the useless _vm->_parse->

Modified Paths:
--------------
    scummvm/trunk/engines/gob/parse.cpp

Modified: scummvm/trunk/engines/gob/parse.cpp
===================================================================
--- scummvm/trunk/engines/gob/parse.cpp	2009-06-18 19:39:12 UTC (rev 41644)
+++ scummvm/trunk/engines/gob/parse.cpp	2009-06-18 21:08:51 UTC (rev 41645)
@@ -79,7 +79,7 @@
 		offset = ptr - ((byte *) _vm->_inter->_variables->getAddressOff8(0));
 		break;
 	case kResStr:
-		offset = ptr - ((byte *) _vm->_parse->_resultStr);
+		offset = ptr - ((byte *) _resultStr);
 		break;
 	default:
 		error("Parse::encodePtr(): Unknown pointer type");
@@ -99,7 +99,7 @@
 		ptr = (byte *) _vm->_inter->_variables->getAddressOff8(0);
 		break;
 	case kResStr:
-		ptr = (byte *) _vm->_parse->_resultStr;
+		ptr = (byte *) _resultStr;
 		break;
 	default:
 		error("Parse::decodePtr(): Unknown pointer type");
@@ -495,11 +495,11 @@
 	if (type == OP_LOAD_IMM_INT16) {
 		cmpTemp = (int)stackFrame.values[-3] - (int)stackFrame.values[-1];
 	} else if (type == OP_LOAD_IMM_STR) {
-		if ((char *)decodePtr(stackFrame.values[-3]) != _vm->_parse->_resultStr) {
-			strcpy(_vm->_parse->_resultStr, (char *)decodePtr(stackFrame.values[-3]));
-			stackFrame.values[-3] = encodePtr((byte *) _vm->_parse->_resultStr, kResStr);
+		if ((char *)decodePtr(stackFrame.values[-3]) != _resultStr) {
+			strcpy(_resultStr, (char *)decodePtr(stackFrame.values[-3]));
+			stackFrame.values[-3] = encodePtr((byte *) _resultStr, kResStr);
 		}
-		cmpTemp = strcmp(_vm->_parse->_resultStr, (char *)decodePtr(stackFrame.values[-1]));
+		cmpTemp = strcmp(_resultStr, (char *)decodePtr(stackFrame.values[-1]));
 	}
 
 	return cmpTemp;
@@ -653,7 +653,7 @@
 int16 Parse::parseValExpr(byte stopToken) {
 	parseExpr(stopToken, 0);
 
-	return _vm->_parse->_resultInt;
+	return _resultInt;
 }
 
 // Load a value according to the operation
@@ -772,29 +772,29 @@
 			do {
 				prevPrevVal = prevVal;
 				prevVal = curVal;
-				curVal = (curVal + _vm->_parse->_resultInt / curVal) / 2;
+				curVal = (curVal + _resultInt / curVal) / 2;
 			} while ((curVal != prevVal) && (curVal != prevPrevVal));
-			_vm->_parse->_resultInt = curVal;
+			_resultInt = curVal;
 			break;
 
 		case FUNC_SQR:
-			_vm->_parse->_resultInt =
-				_vm->_parse->_resultInt * _vm->_parse->_resultInt;
+			_resultInt =
+				_resultInt * _resultInt;
 			break;
 
 		case FUNC_ABS:
-			if (_vm->_parse->_resultInt < 0)
-				_vm->_parse->_resultInt = -_vm->_parse->_resultInt;
+			if (_resultInt < 0)
+				_resultInt = -_resultInt;
 			break;
 
 		case FUNC_RAND:
-			_vm->_parse->_resultInt =
-				_vm->_util->getRandom(_vm->_parse->_resultInt);
+			_resultInt =
+				_vm->_util->getRandom(_resultInt);
 			break;
 		}
 
 		*stackFrame.opers = OP_LOAD_IMM_INT16;
-		*stackFrame.values = _vm->_parse->_resultInt;
+		*stackFrame.values = _resultInt;
 		break;
 	}
 }
@@ -803,11 +803,11 @@
 	switch (stackFrame.opers[-1]) {
 	case OP_ADD:
 		if (stackFrame.opers[-2] == OP_LOAD_IMM_STR) {
-			if ((char *) decodePtr(stackFrame.values[-2]) != _vm->_parse->_resultStr) {
-				strcpy(_vm->_parse->_resultStr, (char *) decodePtr(stackFrame.values[-2]));
-				stackFrame.values[-2] = encodePtr((byte *) _vm->_parse->_resultStr, kResStr);
+			if ((char *) decodePtr(stackFrame.values[-2]) != _resultStr) {
+				strcpy(_resultStr, (char *) decodePtr(stackFrame.values[-2]));
+				stackFrame.values[-2] = encodePtr((byte *) _resultStr, kResStr);
 			}
-			strcat(_vm->_parse->_resultStr, (char *) decodePtr(stackFrame.values[0]));
+			strcat(_resultStr, (char *) decodePtr(stackFrame.values[0]));
 			stackFrame.pop(2);
 		}
 		break;
@@ -879,12 +879,12 @@
 		if (stack.opers[brackStart] == OP_LOAD_IMM_INT16) {
 			stack.values[brackStart] += stackFrame.values[-1];
 		} else if (stack.opers[brackStart] == OP_LOAD_IMM_STR) {
-			if ((char *) decodePtr(stack.values[brackStart]) != _vm->_parse->_resultStr) {
-				strcpy(_vm->_parse->_resultStr, (char *) decodePtr(stack.values[brackStart]));
+			if ((char *) decodePtr(stack.values[brackStart]) != _resultStr) {
+				strcpy(_resultStr, (char *) decodePtr(stack.values[brackStart]));
 				stack.values[brackStart] =
-					encodePtr((byte *) _vm->_parse->_resultStr, kResStr);
+					encodePtr((byte *) _resultStr, kResStr);
 			}
-			strcat(_vm->_parse->_resultStr, (char *) decodePtr(stackFrame.values[-1]));
+			strcat(_resultStr, (char *) decodePtr(stackFrame.values[-1]));
 		}
 		stackFrame.pop(2);
 		break;
@@ -984,12 +984,12 @@
 		break;
 
 	case OP_LOAD_IMM_INT16:
-		_vm->_parse->_resultInt = value;
+		_resultInt = value;
 		break;
 
 	case OP_LOAD_IMM_STR:
-		if ((char *) decodePtr(value) != _vm->_parse->_resultStr)
-			strcpy(_vm->_parse->_resultStr, (char *) decodePtr(value));
+		if ((char *) decodePtr(value) != _resultStr)
+			strcpy(_resultStr, (char *) decodePtr(value));
 		break;
 
 	case OP_LOAD_VAR_INT32:
@@ -997,7 +997,7 @@
 		break;
 
 	default:
-		_vm->_parse->_resultInt = 0;
+		_resultInt = 0;
 		if (type != 0)
 			*type = OP_LOAD_IMM_INT16;
 		break;
@@ -1119,11 +1119,11 @@
 					if (stackFrame.opers[-3] == OP_LOAD_IMM_INT16) {
 						stackFrame.values[-3] += stackFrame.values[-1];
 					} else if (stackFrame.opers[-3] == OP_LOAD_IMM_STR) {
-						if ((char *) decodePtr(stackFrame.values[-3]) != _vm->_parse->_resultStr) {
-							strcpy(_vm->_parse->_resultStr, (char *) decodePtr(stackFrame.values[-3]));
-							stackFrame.values[-3] = encodePtr((byte *) _vm->_parse->_resultStr, kResStr);
+						if ((char *) decodePtr(stackFrame.values[-3]) != _resultStr) {
+							strcpy(_resultStr, (char *) decodePtr(stackFrame.values[-3]));
+							stackFrame.values[-3] = encodePtr((byte *) _resultStr, kResStr);
 						}
-						strcat(_vm->_parse->_resultStr, (char *) decodePtr(stackFrame.values[-1]));
+						strcat(_resultStr, (char *) decodePtr(stackFrame.values[-1]));
 					}
 					stackFrame.pop(2);
 


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