[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.35,1.36

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


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

Modified Files:
	string.cpp 
Log Message:
removed hardcoded values

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- string.cpp	24 Oct 2002 21:39:45 -0000	1.35
+++ string.cpp	27 Oct 2002 08:28:41 -0000	1.36
@@ -219,8 +219,8 @@
 
 			if (_string[0].xpos < 80)
 				_string[0].xpos = 80;
-			if (_string[0].xpos > 240)
-				_string[0].xpos = 240;
+			if (_string[0].xpos > _realWidth - 80)
+				_string[0].xpos = _realWidth - 80;
 		} else {
 			s = a->scaley * a->new_1 / 0xFF;
 			_string[0].ypos = ((a->new_1 - s) >> 1) + s - a->elevation + a->y;
@@ -234,8 +234,8 @@
 			_string[0].xpos = ((a->new_2 - s) >> 1) + s + a->x - camera._cur.x + (_realWidth / 2);
 			if (_string[0].xpos < 80)
 				_string[0].xpos = 80;
-			if (_string[0].xpos > 240)
-				_string[0].xpos = 240;
+			if (_string[0].xpos > _realWidth - 80)
+				_string[0].xpos = _realWidth - 80;
 		}
 	}
 
@@ -1038,7 +1038,7 @@
 	}
 
 	_mask_ptr = _vm->getResourceAddress(rtBuffer, 9)
-		+ _drawTop * 40 + _left / 8 + _vm->_screenStartStrip;
+		+ _drawTop * _vm->gdi._numStrips + _left / 8 + _vm->_screenStartStrip;
 
 	_virtScreenHeight = vs->height;
 	_charPtr += 4;





More information about the Scummvm-git-logs mailing list