[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.156,1.157
Travis Howell
kirben at users.sourceforge.net
Tue Sep 9 20:51:13 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv26863/scumm
Modified Files:
resource.cpp
Log Message:
Correct RO sound resource size for blocked games.
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- resource.cpp 9 Sep 2003 01:21:42 -0000 1.156
+++ resource.cpp 10 Sep 2003 03:50:03 -0000 1.157
@@ -1573,7 +1573,7 @@
ro_size = _fileHandle.readUint16LE();
src_ptr = (byte *) calloc(ro_size - 4, 1);
- _fileHandle.seek(ro_offs +4, SEEK_SET);
+ _fileHandle.seek(ro_offs + 4, SEEK_SET);
_fileHandle.read(src_ptr, ro_size -4);
ptr = createResource(type, idx, ro_size + 2);
@@ -1599,8 +1599,8 @@
(char) ((tag >> 8) & 0xff), size);
if (tag == 0x4F52) { // RO
- ro_size = size;
ro_offs = _fileHandle.pos();
+ ro_size = size;
} else {
pos = 6;
while (pos < total_size) {
@@ -1667,7 +1667,7 @@
return 1;
} else if (ro_offs != 0) {
_fileHandle.seek(ro_offs - 2, SEEK_SET);
- _fileHandle.read(createResource(type, idx, ro_size + 2), ro_size + 2);
+ _fileHandle.read(createResource(type, idx, ro_size - 4), ro_size - 4);
return 1;
}
res.roomoffs[type][idx] = 0xFFFFFFFF;
More information about the Scummvm-git-logs
mailing list