[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.241,1.242

[Travis Howell]

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

Modified Files:
	string.cpp 
Log Message:

Correction from disasm.



Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -d -r1.241 -r1.242
--- string.cpp	15 Aug 2004 04:52:18 -0000	1.241
+++ string.cpp	18 Aug 2004 12:20:26 -0000	1.242
@@ -95,7 +95,7 @@
 	if (getTalkingActor() != 0xFF)
 		a = derefActorSafe(getTalkingActor(), "CHARSET_1");
 
-	if (a && a->isInCurrentRoom() && _string[0].overhead != 0) {
+	if (a && _string[0].overhead != 0) {
 		if (_version <= 5) {
 			_string[0].xpos = a->_pos.x - camera._cur.x + (_screenWidth / 2);
 
@@ -110,9 +110,11 @@
 			s = a->scaley * a->talkPosY / 0xFF;
 			_string[0].ypos = ((a->talkPosY - s) / 2) + s - a->getElevation() + a->_pos.y;
 
-			if (_string[0].ypos < _screenTop) {
-				_string[0].ypos = _screenTop;
-			}
+			if (_features & GF_NEW_CAMERA)
+				_string[0].ypos = _string[0].ypos - camera._cur.y + (_screenHeight / 2);
+
+			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);