[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.193.2.1,1.193.2.2

Max Horn fingolfin at users.sourceforge.net
Sat Apr 3 15:15:01 CEST 2004


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

Modified Files:
      Tag: branch-0-6-0
	string.cpp 
Log Message:
backport fix from HEAD

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.193.2.1
retrieving revision 1.193.2.2
diff -u -d -r1.193.2.1 -r1.193.2.2
--- string.cpp	22 Feb 2004 08:04:33 -0000	1.193.2.1
+++ string.cpp	3 Apr 2004 23:01:44 -0000	1.193.2.2
@@ -112,7 +112,7 @@
 	if (talkingActor() != 0xFF)
 		a = derefActorSafe(talkingActor(), "CHARSET_1");
 
-	if (a && _string[0].overhead != 0) {
+	if (a && a->isInCurrentRoom() && _string[0].overhead != 0) {
 		if (_version <= 5) {
 			_string[0].xpos = a->_pos.x - camera._cur.x + (_screenWidth / 2);
 





More information about the Scummvm-git-logs mailing list