diff options
author | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
commit | 75e8452b6e6a2bf4fb2f588aa00b428a60d873b5 (patch) | |
tree | f29541d55309487a94bd1d38e8b53bb3dde9aec6 /engines/scumm/script.cpp | |
parent | 48ee83b88957dab86bc763e9ef21a70179fa8679 (diff) | |
parent | e9f50882ea5b6beeefa994040be9d3bab6a1f107 (diff) | |
download | scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.gz scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.bz2 scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.zip |
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
Diffstat (limited to 'engines/scumm/script.cpp')
-rw-r--r-- | engines/scumm/script.cpp | 19 |
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; |