diff options
| author | Max Horn | 2002-11-06 16:44:57 +0000 |
|---|---|---|
| committer | Max Horn | 2002-11-06 16:44:57 +0000 |
| commit | 18153f22c9c45d03ed5a3b77d17d7b7a9c602b58 (patch) | |
| tree | de2f5f8699674ed4eb9fe4c16a38bae1dd9c3253 /scumm/script.cpp | |
| parent | 004afead33bceab805bde3c6ca6d299f582612af (diff) | |
| download | scummvm-rg350-18153f22c9c45d03ed5a3b77d17d7b7a9c602b58.tar.gz scummvm-rg350-18153f22c9c45d03ed5a3b77d17d7b7a9c602b58.tar.bz2 scummvm-rg350-18153f22c9c45d03ed5a3b77d17d7b7a9c602b58.zip | |
why keep a seperate opcode entry & opcode description table if we can have it both in one (note that the descriptions were in fact outdated in some cases! also note, this is really just a refactoring, no functionality is changed except that opcode descriptions are now in sync with the opcode procs, that's why I am commiting this at all)
svn-id: r5445
Diffstat (limited to 'scumm/script.cpp')
| -rw-r--r-- | scumm/script.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp index fef4acf855..ec6ec74202 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -283,7 +283,7 @@ void Scumm::executeScript() _opcode = fetchScriptByte(); _scriptPointerStart = _scriptPointer; vm.slot[_currentScript].didexec = 1; - debug(8, "Script %d: [%X] %s()", vm.slot[_currentScript].number, _opcode, _opcodes_lookup[_opcode]); + debug(8, "Script %d: [%X] %s()", vm.slot[_currentScript].number, _opcode, _opcodes[_opcode].desc); op = getOpcode(_opcode); (this->*op) (); } @@ -861,7 +861,7 @@ void Scumm::push(int a) int Scumm::pop() { if ((_scummStackPos < 1) || ((unsigned int)_scummStackPos > ARRAYSIZE(_scummStack))) { - error("No items on stack to pop() for %s (0x%X) at [%d-%d]\n", _opcodes_lookup[_opcode], _opcode, _roomResource, vm.slot[_currentScript].number); + error("No items on stack to pop() for %s (0x%X) at [%d-%d]\n", _opcodes[_opcode].desc, _opcode, _roomResource, vm.slot[_currentScript].number); } return _scummStack[--_scummStackPos]; |