[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.256,1.257

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13650

Modified Files:
	string.cpp 
Log Message:
cleanup

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -d -r1.256 -r1.257
--- string.cpp	28 Sep 2004 19:28:59 -0000	1.256
+++ string.cpp	29 Sep 2004 22:06:24 -0000	1.257
@@ -96,7 +96,7 @@
 void ScummEngine::CHARSET_1() {
 	uint32 talk_sound_a = 0;
 	uint32 talk_sound_b = 0;
-	int s, i, t, c;
+	int i, t, c;
 	int frme;
 	Actor *a;
 	byte *buffer;
@@ -116,28 +116,29 @@
 		a = derefActorSafe(getTalkingActor(), "CHARSET_1");
 
 	if (a && _string[0].overhead != 0) {
+		int s;
+
+		_string[0].xpos = a->_pos.x - virtscr[0].xstart;
+		_string[0].ypos = a->_pos.y - a->getElevation() - _screenTop;
+
 		if (_version <= 5) {
-			_string[0].xpos = a->_pos.x - camera._cur.x + (_screenWidth / 2);
 
 			if (VAR(VAR_V5_TALK_STRING_Y) < 0) {
 				s = (a->scaley * (int)VAR(VAR_V5_TALK_STRING_Y)) / 0xFF;
-				_string[0].ypos = (int)(((VAR(VAR_V5_TALK_STRING_Y) - s) / 2) + s - a->getElevation() + a->_pos.y);
+				_string[0].ypos += (int)(((VAR(VAR_V5_TALK_STRING_Y) - s) / 2) + s);
 			} else {
 				_string[0].ypos = (int)VAR(VAR_V5_TALK_STRING_Y);
 			}
 
 		} else {
-			s = a->scaley * a->talkPosY / 0xFF;
-			_string[0].ypos = ((a->talkPosY - s) / 2) + s - a->getElevation() + a->_pos.y;
+			s = a->scalex * a->talkPosX / 0xFF;
+			_string[0].xpos += ((a->talkPosX - s) / 2) + s;
 
-			if (_features & GF_NEW_CAMERA)
-				_string[0].ypos = _string[0].ypos - camera._cur.y + (_screenHeight / 2);
+			s = a->scaley * a->talkPosY / 0xFF;
+			_string[0].ypos += ((a->talkPosY - s) / 2) + s;
 
 			if (_string[0].ypos > _screenHeight - 40)
 				_string[0].ypos = _screenHeight - 40;
-
-			s = a->scalex * a->talkPosX / 0xFF;
-			_string[0].xpos = ((a->talkPosX - s) / 2) + s + a->_pos.x - camera._cur.x + (_screenWidth / 2);
 		}
 
 		if (_string[0].ypos < 1)