[Scummvm-cvs-logs] SF.net SVN: scummvm:[52129] scummvm/trunk/engines/scumm

[fingolfin at users.sourceforge.net]

Revision: 52129
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52129&view=rev
Author:   fingolfin
Date:     2010-08-16 19:57:35 +0000 (Mon, 16 Aug 2010)

Log Message:
-----------
SCUMM: Move setResult/getResultPos to script_v5.cpp

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script.cpp
    scummvm/trunk/engines/scumm/script_v5.cpp

Modified: scummvm/trunk/engines/scumm/script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script.cpp	2010-08-16 18:55:58 UTC (rev 52128)
+++ scummvm/trunk/engines/scumm/script.cpp	2010-08-16 19:57:35 UTC (rev 52129)
@@ -708,25 +708,6 @@
 	error("Illegal varbits (w)");
 }
 
-void ScummEngine_v5::getResultPos() {
-	int a;
-
-	_resultVarNumber = fetchScriptWord();
-	if (_resultVarNumber & 0x2000) {
-		a = fetchScriptWord();
-		if (a & 0x2000) {
-			_resultVarNumber += readVar(a & ~0x2000);
-		} else {
-			_resultVarNumber += a & 0xFFF;
-		}
-		_resultVarNumber &= ~0x2000;
-	}
-}
-
-void ScummEngine_v5::setResult(int value) {
-	writeVar(_resultVarNumber, value);
-}
-
 void ScummEngine::push(int a) {
 	assert(_scummStackPos >= 0 && _scummStackPos < ARRAYSIZE(_vmStack));
 	_vmStack[_scummStackPos++] = a;

Modified: scummvm/trunk/engines/scumm/script_v5.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v5.cpp	2010-08-16 18:55:58 UTC (rev 52128)
+++ scummvm/trunk/engines/scumm/script_v5.cpp	2010-08-16 19:57:35 UTC (rev 52129)
@@ -377,6 +377,25 @@
 	return fetchScriptWordSigned();
 }
 
+void ScummEngine_v5::getResultPos() {
+	int a;
+
+	_resultVarNumber = fetchScriptWord();
+	if (_resultVarNumber & 0x2000) {
+		a = fetchScriptWord();
+		if (a & 0x2000) {
+			_resultVarNumber += readVar(a & ~0x2000);
+		} else {
+			_resultVarNumber += a & 0xFFF;
+		}
+		_resultVarNumber &= ~0x2000;
+	}
+}
+
+void ScummEngine_v5::setResult(int value) {
+	writeVar(_resultVarNumber, value);
+}
+
 void ScummEngine_v5::jumpRelative(bool cond) {
 	// We explicitly call ScummEngine::fetchScriptWord()
 	// to make this method work also in v0, which overloads


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