[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.33,1.34 script.cpp,1.18,1.19
Max Horn
fingolfin at users.sourceforge.net
Mon Dec 23 08:18:03 CET 2002
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv16776
Modified Files:
resource.cpp script.cpp
Log Message:
don't be needlessly verbose; allow byte arrays in V8
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- resource.cpp 23 Dec 2002 00:21:49 -0000 1.33
+++ resource.cpp 23 Dec 2002 16:17:23 -0000 1.34
@@ -367,13 +367,10 @@
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) {
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- script.cpp 23 Dec 2002 00:23:36 -0000 1.18
+++ script.cpp 23 Dec 2002 16:17:23 -0000 1.19
@@ -398,9 +398,9 @@
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 @@
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;
}
More information about the Scummvm-git-logs
mailing list