[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,1.41,1.42 verbs.cpp,1.4,1.5

Pawe? Ko?odziejski aquadran at users.sourceforge.net
Sun Oct 27 01:42:02 CEST 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv4804

Modified Files:
	gfx.cpp verbs.cpp 
Log Message:
removed hardcoded values

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- gfx.cpp	24 Oct 2002 13:18:28 -0000	1.41
+++ gfx.cpp	27 Oct 2002 09:41:33 -0000	1.42
@@ -1333,7 +1333,7 @@
 					do {
 						if (!--_currentX) {
 							_currentX = 8;
-							dst += 312;
+							dst += _vm->_realWidth - 8;
 							if (!--_tempNumLines)
 								return;
 						}
@@ -1351,7 +1351,7 @@
 				bits >>= _decomp_shr;
 			}
 		} while (--_currentX);
-		dst += 312;
+		dst += _vm->_realWidth - 8;
 	} while (--_tempNumLines);
 }
 
@@ -1386,7 +1386,7 @@
 				color += inc;
 			}
 		} while (--_currentX);
-		dst += 312;
+		dst += _vm->_realWidth - 8;
 	} while (--_tempNumLines);
 }
 
@@ -1424,7 +1424,7 @@
 						do {
 							if (!--_currentX) {
 								_currentX = 8;
-								dst += 312;
+								dst += _vm->_realWidth - 8;
 								if (!--_tempNumLines)
 									return;
 							}
@@ -1434,7 +1434,7 @@
 						do {
 							if (!--_currentX) {
 								_currentX = 8;
-								dst += 312;
+								dst += _vm->_realWidth - 8;
 								if (!--_tempNumLines)
 									return;
 							}
@@ -1451,7 +1451,7 @@
 				bits >>= _decomp_shr;
 			}
 		} while (--_currentX);
-		dst += 312;
+		dst += _vm->_realWidth - 8;
 	} while (--_tempNumLines);
 }
 
@@ -1518,7 +1518,7 @@
 				color += inc;
 			}
 		} while (--_currentX);
-		dst += 312;
+		dst += _vm->_realWidth - 8;
 	} while (--_tempNumLines);
 }
 
@@ -1800,6 +1800,7 @@
 	bgbak = getResourceAddress(rtBuffer, vs->number + 5) + height;
 	mask = getResourceAddress(rtBuffer, 9) + top * gdi._numStrips + (left >> 3) + _screenStartStrip;
 	if (vs->number == 0) {
+		// FIXME: hardcoded value
 		mask += vs->topline * 216;
 	}
 
@@ -3246,7 +3247,7 @@
 				for (i = 0; i < num; i++) {
 					if (bd->scale_x == 255 || scale_cols[src_x]) {
 						if (dst_x >= 0 && dst_x < bd->outwidth) {
-							if (!(*(mask + dst_y * 40 + (dst_x >> 3)) & revBitMask[dst_x & 7]))
+							if (!(*(mask + dst_y * gdi._numStrips + (dst_x >> 3)) & revBitMask[dst_x & 7]))
 							
 								*d = blend(_currentPalette, color, *d);
 						}
@@ -3259,7 +3260,7 @@
 				for (i = 0; i < num; i++) {
 					if (bd->scale_x == 255 || scale_cols[src_x]) {
 						if (dst_x >= 0 && dst_x < bd->outwidth)
-							if (!(*(mask + dst_y * 40 + (dst_x >> 3)) & revBitMask[dst_x & 7]))
+							if (!(*(mask + dst_y * gdi._numStrips + (dst_x >> 3)) & revBitMask[dst_x & 7]))
 								*d = blend(_currentPalette, src[i], *d);
 						d++;
 						dst_x++;

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- verbs.cpp	24 Oct 2002 06:28:54 -0000	1.4
+++ verbs.cpp	27 Oct 2002 09:41:33 -0000	1.5
@@ -134,7 +134,7 @@
 		_string[4].charset = vs->charset_nr;
 		_string[4].xpos = vs->x;
 		_string[4].ypos = vs->y;
-		_string[4].right = 319;
+		_string[4].right = _realWidth - 1;
 		_string[4].center = vs->center;
 
 		if (vs->curmode == 2)





More information about the Scummvm-git-logs mailing list