diff options
author | Paul Gilbert | 2009-11-11 09:55:05 +0000 |
---|---|---|
committer | Paul Gilbert | 2009-11-11 09:55:05 +0000 |
commit | faaec05e65c4d4d1b2e079120df5cc14b003d3fd (patch) | |
tree | 63fdf66dba59a240e3f779ec0f77c23ad1ff3475 /engines/m4/console.cpp | |
parent | 8ed71d903a81a8bfb744ad7bf652c52f062a18c9 (diff) | |
download | scummvm-rg350-faaec05e65c4d4d1b2e079120df5cc14b003d3fd.tar.gz scummvm-rg350-faaec05e65c4d4d1b2e079120df5cc14b003d3fd.tar.bz2 scummvm-rg350-faaec05e65c4d4d1b2e079120df5cc14b003d3fd.zip |
Removed all the '- 1' from calls to get vocabs, centralising it in the getVocab method. This is correct, as the first element in the game vocab list is '1', not '0'.
svn-id: r45827
Diffstat (limited to 'engines/m4/console.cpp')
-rw-r--r-- | engines/m4/console.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/m4/console.cpp b/engines/m4/console.cpp index 7cf2120dc7..17fa20882a 100644 --- a/engines/m4/console.cpp +++ b/engines/m4/console.cpp @@ -310,7 +310,7 @@ bool Console::cmdObject(int argc, const char **argv) { DebugPrintf("%2d - ", objStart); for (uint objId = objStart; objId < MIN<uint>(_vm->_globals->getObjectsSize(), objStart + 5); ++objId) { if (objId != objStart) DebugPrintf(", "); - uint16 descId = _vm->_globals->getObject(objId)->descId - 1; + uint16 descId = _vm->_globals->getObject(objId)->descId; DebugPrintf("%s", _vm->_globals->getVocab(descId)); } @@ -327,13 +327,13 @@ bool Console::cmdObject(int argc, const char **argv) { else { const MadsObject *obj = _vm->_globals->getObject(id); - DebugPrintf("Object #%d (%s) room=%d vocabs=%d", id, _vm->_globals->getVocab(obj->descId - 1), + DebugPrintf("Object #%d (%s) room=%d vocabs=%d", id, _vm->_globals->getVocab(obj->descId), obj->roomNumber, obj->vocabCount); if (obj->vocabCount > 0) { DebugPrintf(" - "); for (int i = 0; i < obj->vocabCount; ++i) { if (i != 0) DebugPrintf(", "); - DebugPrintf("%s (%d)/%d", _vm->_globals->getVocab(obj->vocabList[i].vocabId - 1), + DebugPrintf("%s (%d)/%d", _vm->_globals->getVocab(obj->vocabList[i].vocabId), obj->vocabList[i].vocabId, obj->vocabList[i].unk); } } |