[Scummvm-cvs-logs] SF.net SVN: scummvm: [29634] scummvm/trunk/engines/scumm/he/script_v72he. cpp
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Sun Nov 25 11:04:23 CET 2007
Revision: 29634
http://scummvm.svn.sourceforge.net/scummvm/?rev=29634&view=rev
Author: Kirben
Date: 2007-11-25 02:04:23 -0800 (Sun, 25 Nov 2007)
Log Message:
-----------
Fix regression in Fun Shop titles, when starting activites.
Modified Paths:
--------------
scummvm/trunk/engines/scumm/he/script_v72he.cpp
Modified: scummvm/trunk/engines/scumm/he/script_v72he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v72he.cpp 2007-11-25 09:37:15 UTC (rev 29633)
+++ scummvm/trunk/engines/scumm/he/script_v72he.cpp 2007-11-25 10:04:23 UTC (rev 29634)
@@ -1776,13 +1776,12 @@
}
int ScummEngine_v72he::readFileToArray(int slot, int32 size) {
- assert(_hInFileTable[slot]);
- if (size == 0)
- size = _hInFileTable[slot]->size() - _hInFileTable[slot]->pos();
-
writeVar(0, 0);
byte *data = defineArray(0, kByteArray, 0, 0, 0, size);
- _hInFileTable[slot]->read(data, size + 1);
+
+ if (slot != -1) {
+ _hInFileTable[slot]->read(data, size + 1);
+ }
return readVar(0);
}
@@ -1828,8 +1827,9 @@
int32 size = (FROM_LE_32(ah->dim1end) - FROM_LE_32(ah->dim1start) + 1) *
(FROM_LE_32(ah->dim2end) - FROM_LE_32(ah->dim2start) + 1);
- assert(_hOutFileTable[slot]);
- _hOutFileTable[slot]->write(ah->data, size);
+ if (slot != -1) {
+ _hOutFileTable[slot]->write(ah->data, size);
+ }
}
void ScummEngine_v72he::o72_writeFile() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list