[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.448,2.449
Max Horn
fingolfin at users.sourceforge.net
Sat May 14 15:56:50 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.133,1.134 dialogs.h,1.50,1.51
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.354,1.355 akos.cpp,1.223,1.224 bomp.cpp,2.28,2.29 camera.cpp,2.32,2.33 cursor.cpp,2.39,2.40 input.cpp,2.29,2.30 intern.h,2.483,2.484 logic_he.cpp,2.13,2.14 module.mk,1.52,1.53 object.cpp,1.239,1.240 palette.cpp,2.41,2.42 resource.cpp,1.324,1.325 saveload.cpp,1.223,1.224 script_v6.cpp,1.436,1.437 scumm.cpp,1.511,1.512 sound.cpp,1.460,1.461 string.cpp,1.290,1.291 vars.cpp,1.136,1.137
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30643
Modified Files:
gfx.cpp
Log Message:
Merge loop limits into one)
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.448
retrieving revision 2.449
diff -u -d -r2.448 -r2.449
--- gfx.cpp 14 May 2005 14:06:35 -0000 2.448
+++ gfx.cpp 14 May 2005 22:55:39 -0000 2.449
@@ -1414,9 +1414,17 @@
//if (_vm->_NESStartStrip > 0)
// stripnr -= _vm->_NESStartStrip;
- for (int k = 0;
- k < numstrip && sx + k < _numStrips && (x + k) * 8 < MAX(_vm->_roomWidth, (int) vs->w);
- ++k, ++stripnr) {
+ // Compute the number of strips we have to iterate over.
+ // TODO/FIXME: The computation of its initial value looks very fishy.
+ // It was added as a kind of hack to fix some corner cases, but it compares
+ // the room width to the virtual screen width; but the former should always
+ // be bigger than the latter (except for MM NES, maybe)... strange
+ int limit = MAX(_vm->_roomWidth, (int) vs->w) / 8 - x;
+ if (limit > numstrip)
+ limit = numstrip;
+ if (limit > _numStrips - sx)
+ limit = _numStrips - sx;
+ for (int k = 0; k < limit; ++k, ++stripnr) {
CHECK_HEAP;
if (y < vs->tdirty[sx + k])
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.133,1.134 dialogs.h,1.50,1.51
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.354,1.355 akos.cpp,1.223,1.224 bomp.cpp,2.28,2.29 camera.cpp,2.32,2.33 cursor.cpp,2.39,2.40 input.cpp,2.29,2.30 intern.h,2.483,2.484 logic_he.cpp,2.13,2.14 module.mk,1.52,1.53 object.cpp,1.239,1.240 palette.cpp,2.41,2.42 resource.cpp,1.324,1.325 saveload.cpp,1.223,1.224 script_v6.cpp,1.436,1.437 scumm.cpp,1.511,1.512 sound.cpp,1.460,1.461 string.cpp,1.290,1.291 vars.cpp,1.136,1.137
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list