[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,1.8,1.9 scummvm.cpp,1.9,1.10 string.cpp,1.7,1.8

[Pawe? Ko?odziejski]

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

Modified Files:
	gfx.cpp scummvm.cpp string.cpp 
Log Message:
more fixes

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gfx.cpp	31 Aug 2002 18:46:00 -0000	1.8
+++ gfx.cpp	31 Aug 2002 18:57:07 -0000	1.9
@@ -244,8 +244,8 @@
 
 	do {
 		memcpy(dst, src, w);
-		dst += 320;
-		src += 320;
+		dst += _vm->_realWidth;
+		src += _vm->_realWidth;
 	} while (--h);
 }
 

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- scummvm.cpp	31 Aug 2002 16:29:17 -0000	1.9
+++ scummvm.cpp	31 Aug 2002 18:57:08 -0000	1.10
@@ -92,10 +92,10 @@
 		_realWidth = 320;
 		_realHeight = 240;
 	} else {
-	if (_gameId == GID_CMI) {
-		_realWidth = 640;
-		_realHeight = 480;
-	} else {
+	if (_gameId == GID_CMI) {
+		_realWidth = 640;
+		_realHeight = 480;
+	} else {
 		_realWidth = 320;
 		_realHeight = 200;
 	}

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- string.cpp	31 Aug 2002 18:46:00 -0000	1.7
+++ string.cpp	31 Aug 2002 18:57:08 -0000	1.8
@@ -219,7 +219,7 @@
 
 	if (a && string[0].overhead != 0) {
 		if (!(_features & GF_AFTER_V6)) {
-			string[0].xpos = a->x - camera._cur.x + 160;
+			string[0].xpos = a->x - camera._cur.x + (_vm->_realWidth / 2);
 
 			if (_vars[VAR_V5_TALK_STRING_Y] < 0) {
 				s = (a->scaley * (int)_vars[VAR_V5_TALK_STRING_Y]) / 0xFF;
@@ -451,7 +451,7 @@
 
 	buffer = charset._buffer + charset._bufPos;
 	string[0].ypos = camera._cur.y + 88;
-	string[0].xpos = 160 - (charset.getStringWidth(0, buffer, 0) >> 1);
+	string[0].xpos = (_vm->_realWidth / 2) - (charset.getStringWidth(0, buffer, 0) >> 1);
 	if (string[0].xpos < 0)
 		string[0].xpos = 0;