OPENGL: Merged from trunk, from rev 52105 to 53396.

This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.

Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.

svn-id: r53399

1 files changed, 0 insertions, 19 deletions

diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 29f0c025d2..223e9822e2 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -708,25 +708,6 @@ void ScummEngine::writeVar(uint var, int value) {
 	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;