diff options
| author | Max Horn | 2002-12-23 16:17:23 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-23 16:17:23 +0000 |
| commit | 7d052a26b0db3b5bbcce0d1fb997844e05e637f9 (patch) | |
| tree | 65a15ebe03e811eec534ab57274833b071b7391e | |
| parent | f86eaeaff9ae16c345f78fd240915e7109d98e19 (diff) | |
| download | scummvm-rg350-7d052a26b0db3b5bbcce0d1fb997844e05e637f9.tar.gz scummvm-rg350-7d052a26b0db3b5bbcce0d1fb997844e05e637f9.tar.bz2 scummvm-rg350-7d052a26b0db3b5bbcce0d1fb997844e05e637f9.zip | |
don't be needlessly verbose; allow byte arrays in V8
svn-id: r6071
| -rw-r--r-- | scumm/resource.cpp | 5 | ||||
| -rw-r--r-- | scumm/script.cpp | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 6224b95e35..e762c8201d 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -367,13 +367,10 @@ void Scumm::readArrayFromIndexFile() int a, b, c; if (_features & GF_AFTER_V8) { - // FIXME - this is just a guess while ((num = _fileHandle.readUint32LE()) != 0) { a = _fileHandle.readUint32LE(); b = _fileHandle.readUint32LE(); - - printf("Reading array (0x%08x,%d,%d) - (pos = 0x%08x)\n", num, a, b, _fileHandle.pos()); - defineArray(num, 0, a, b); + defineArray(num, 5, a, b); } } else { while ((num = _fileHandle.readUint16LE()) != 0) { diff --git a/scumm/script.cpp b/scumm/script.cpp index 182e0ce5f4..1da366d007 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -398,9 +398,9 @@ void Scumm::writeVar(uint var, int value) if ((_varwatch == (int)var) || (_varwatch == 0)) { if (vm.slot[_currentScript].number < 100) - debug(0, "vars[%d] = %d (via script-%d)", var, value, vm.slot[_currentScript].number); + debug(1, "vars[%d] = %d (via script-%d)", var, value, vm.slot[_currentScript].number); else - debug(0, "vars[%d] = %d (via room-%d-%d)", var, value, _currentRoom, + debug(1, "vars[%d] = %d (via room-%d-%d)", var, value, _currentRoom, vm.slot[_currentScript].number); } return; @@ -1016,7 +1016,7 @@ int Scumm::defineArray(int array, int type, int dim2, int dim1) writeVar(array, id); if (_features & GF_AFTER_V8) { - size = 32; // FIXME - this is just a guess + size = (type == 5) ? 32 : 8; } else { size = (type == 5) ? 16 : 8; } |