[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.27,1.28 costume.cpp,1.8,1.9

Max Horn fingolfin at projects.sourceforge.net
Mon Nov 18 17:46:02 CET 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv28518

Modified Files:
	akos.cpp costume.cpp 
Log Message:
Patch #639699: SAM: Fix for graphics glitch

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- akos.cpp	8 Nov 2002 18:40:11 -0000	1.27
+++ akos.cpp	19 Nov 2002 01:45:08 -0000	1.28
@@ -319,7 +319,7 @@
 
 				if (v1.scaletable[v1.tmp_x] < scale_x) {
 					v1.x += v1.scaleXstep;
-					if (v1.x >= _vm->_realWidth)
+					if (v1.x < 0 || v1.x >= _vm->_realWidth)
 						return;
 					maskbit = revBitMask[v1.x & 7];
 					v1.destptr += v1.scaleXstep;
@@ -387,7 +387,7 @@
 
 				if (v1.scaletable[v1.tmp_x] < scale_x) {
 					v1.x += v1.scaleXstep;
-					if (v1.x >= _vm->_realWidth)
+					if (v1.x < 0 || v1.x >= _vm->_realWidth)
 						return;
 					maskbit = revBitMask[v1.x & 7];
 					v1.destptr += v1.scaleXstep;
@@ -463,7 +463,7 @@
 
 				if (v1.scaletable[v1.tmp_x] < scale_x) {
 					v1.x += v1.scaleXstep;
-					if (v1.x >= _vm->_realWidth)
+					if (v1.x < 0 || v1.x >= _vm->_realWidth)
 						return;
 					maskbit = revBitMask[v1.x & 7];
 					v1.destptr += v1.scaleXstep;

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- costume.cpp	24 Oct 2002 06:28:54 -0000	1.8
+++ costume.cpp	19 Nov 2002 01:45:08 -0000	1.9
@@ -584,7 +584,7 @@
 				_scaleIndexX = t + _scaleIndexXStep;
 				if (cost_scaleTable[t] < _scaleX) {
 					_xpos += _scaleIndexXStep;
-					if (_xpos >= _vm->_realWidth)
+					if (_xpos < 0 || _xpos >= _vm->_realWidth)
 						return;
 					maskbit = revBitMask[_xpos & 7];
 					_backbuff_ptr += _scaleIndexXStep;
@@ -646,7 +646,7 @@
 				_scaleIndexX = t + _scaleIndexXStep;
 				if (cost_scaleTable[t] < _scaleX) {
 					_xpos += _scaleIndexXStep;
-					if (_xpos >= _vm->_realWidth)
+					if (_xpos < 0 || _xpos >= _vm->_realWidth)
 						return;
 					maskbit = revBitMask[_xpos & 7];
 					_backbuff_ptr += _scaleIndexXStep;
@@ -707,7 +707,7 @@
 				_scaleIndexX = t + _scaleIndexXStep;
 				if (cost_scaleTable[t] < _scaleX) {
 					_xpos += _scaleIndexXStep;
-					if (_xpos >= _vm->_realWidth)
+					if (_xpos < 0 || _xpos >= _vm->_realWidth)
 						return;
 					_backbuff_ptr += _scaleIndexXStep;
 				}
@@ -1180,7 +1180,7 @@
 				_scaleIndexX = t + _scaleIndexXStep;
 				if (cost_scaleTable[t] < _scaleX) {
 					_xpos += _scaleIndexXStep;
-					if (_xpos >= _vm->_realWidth)
+					if (_xpos < 0 || _xpos >= _vm->_realWidth)
 						return;
 					maskbit = revBitMask[_xpos & 7];
 					_backbuff_ptr += _scaleIndexXStep;





More information about the Scummvm-git-logs mailing list