[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.342,2.343 object.cpp,1.194,1.195
Travis Howell
kirben at users.sourceforge.net
Sun Sep 26 18:39:21 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4539/scumm
Modified Files:
gfx.cpp object.cpp
Log Message:
tentacle (and maybe others) were reading too far.
Hopefully this way will work better.
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.342
retrieving revision 2.343
diff -u -d -r2.342 -r2.343
--- gfx.cpp 27 Sep 2004 01:26:05 -0000 2.342
+++ gfx.cpp 27 Sep 2004 01:35:19 -0000 2.343
@@ -1219,7 +1219,7 @@
sx = 0;
}
- while (numstrip && sx < _numStrips && x * 8 < MAX(_vm->_roomWidth, (int) vs->w)) {
+ while (numstrip && sx < _numStrips && x * 8 < width) {
CHECK_HEAP;
if (y < vs->tdirty[sx])
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- object.cpp 26 Sep 2004 15:44:49 -0000 1.194
+++ object.cpp 27 Sep 2004 01:35:19 -0000 1.195
@@ -495,7 +495,7 @@
if (_heversion >= 70 && findResource(MKID('SMAP'), ptr) == NULL)
gdi.drawBMAPObject(ptr, &virtscr[0], obj, od.x_pos * 8, od.y_pos * 8, od.width * 8, od.height * 8);
else
- gdi.drawBitmap(ptr, &virtscr[0], x, ypos, width * 8, height, x - xpos, numstrip, flags);
+ gdi.drawBitmap(ptr, &virtscr[0], x, ypos, _roomWidth, height, x - xpos, numstrip, flags);
}
}
More information about the Scummvm-git-logs
mailing list