[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.209,1.210
Max Horn
fingolfin at users.sourceforge.net
Sat Apr 3 05:29:28 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: web downloads.php,1.87,1.88
- Next message: [Scummvm-cvs-logs] CVS: scummvm/queen command.cpp,1.73,1.74 command.h,1.20,1.21 journal.cpp,1.35,1.36 logic.cpp,1.197,1.198 talk.cpp,1.96,1.97 talk.h,1.32,1.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31125/scumm
Modified Files:
string.cpp
Log Message:
Fix for bug #896844 (DIG: Missing subtitle at the lab console)
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -r1.209 -r1.210
--- string.cpp 3 Apr 2004 00:56:55 -0000 1.209
+++ string.cpp 3 Apr 2004 13:16:02 -0000 1.210
@@ -107,7 +107,7 @@
if (getTalkingActor() != 0xFF)
a = derefActorSafe(getTalkingActor(), "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);
- Previous message: [Scummvm-cvs-logs] CVS: web downloads.php,1.87,1.88
- Next message: [Scummvm-cvs-logs] CVS: scummvm/queen command.cpp,1.73,1.74 command.h,1.20,1.21 journal.cpp,1.35,1.36 logic.cpp,1.197,1.198 talk.cpp,1.96,1.97 talk.h,1.32,1.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list