diff options
| author | Max Horn | 2004-01-08 20:37:26 +0000 |
|---|---|---|
| committer | Max Horn | 2004-01-08 20:37:26 +0000 |
| commit | ebecf1dbaa0284f22a053e5b2e9510d6e6db4fdf (patch) | |
| tree | 98b45acc08e3f2a2ecaf22fb60a614d9f31f17e6 /scumm/script.cpp | |
| parent | e68a3650594fc3a62a26aece5705eb3602b6d1ad (diff) | |
| download | scummvm-rg350-ebecf1dbaa0284f22a053e5b2e9510d6e6db4fdf.tar.gz scummvm-rg350-ebecf1dbaa0284f22a053e5b2e9510d6e6db4fdf.tar.bz2 scummvm-rg350-ebecf1dbaa0284f22a053e5b2e9510d6e6db4fdf.zip | |
unify _vm / _scumm usage
svn-id: r12262
Diffstat (limited to 'scumm/script.cpp')
| -rw-r--r-- | scumm/script.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp index 9beea1d698..70bafab194 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -399,7 +399,7 @@ void ScummEngine::executeScript() { if (_showStack == 1) { printf("Stack:"); for (c=0; c < _scummStackPos; c++) { - printf(" %d", _scummStack[c]); + printf(" %d", _vmStack[c]); } printf("\n"); } @@ -617,16 +617,16 @@ void ScummEngine::setResult(int value) { } void ScummEngine::push(int a) { - assert(_scummStackPos >= 0 && _scummStackPos < ARRAYSIZE(_scummStack)); - _scummStack[_scummStackPos++] = a; + assert(_scummStackPos >= 0 && _scummStackPos < ARRAYSIZE(_vmStack)); + _vmStack[_scummStackPos++] = a; } int ScummEngine::pop() { - if (_scummStackPos < 1 || _scummStackPos > ARRAYSIZE(_scummStack)) { + if (_scummStackPos < 1 || _scummStackPos > ARRAYSIZE(_vmStack)) { error("No items on stack to pop() for %s (0x%X) at [%d-%d]", getOpcodeDesc(_opcode), _opcode, _roomResource, vm.slot[_currentScript].number); } - return _scummStack[--_scummStackPos]; + return _vmStack[--_scummStackPos]; } void ScummEngine::stopObjectCode() { |