[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.13,1.14 scummvm.cpp,1.48,1.49 string.cpp,1.23,1.24

[James Brown]

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

Modified Files:
	actor.cpp scummvm.cpp string.cpp 
Log Message:
Patch 617937 / Bug 617939 + modifications: Fix FT text masking


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- actor.cpp	2 Oct 2002 09:14:59 -0000	1.13
+++ actor.cpp	3 Oct 2002 07:38:02 -0000	1.14
@@ -899,7 +899,7 @@
 		}
 	} else {
 		AkosRenderer ar(_vm);
-
+		ar.charsetmask = true;
 		ar.x = x - _vm->virtscr->xstart;
 		ar.y = y - elevation;
 		ar.scale_x = scalex;
@@ -910,7 +910,6 @@
 			if (ar.clipping > (byte)_vm->gdi._numZBuffer)
 				ar.clipping = _vm->gdi._numZBuffer;
 		}
-		ar.charsetmask = _vm->_vars[_vm->VAR_CHARSET_MASK] != 0;
 
 		ar.outptr = _vm->virtscr->screenPtr + _vm->virtscr->xstart;
 		ar.outwidth = _vm->virtscr->width;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- scummvm.cpp	2 Oct 2002 13:25:06 -0000	1.48
+++ scummvm.cpp	3 Oct 2002 07:38:02 -0000	1.49
@@ -374,9 +374,15 @@
 
 	decreaseScriptDelay(delta);
 
-	_talkDelay -= delta;
-	if (_talkDelay < 0)
-		_talkDelay = 0;
+	// If _talkDelay is -1, that means the text should never time out.
+	// This is used for drawing verb texts, e.g. the Full Throttle
+	// dialogue choices.
+
+	if (_talkDelay != -1) {
+		_talkDelay -= delta;
+		if (_talkDelay < 0)
+			_talkDelay = 0;
+	}
 
 	processKbd();
 

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- string.cpp	2 Oct 2002 17:23:19 -0000	1.23
+++ string.cpp	3 Oct 2002 07:38:03 -0000	1.24
@@ -560,10 +560,9 @@
 		charset._left -= charset.getStringWidth(a, buf, 0) >> 1;
 	}
 
-	// Full Throttle's conversation menus should definitely mask the
-	// background.
-	if (!(_features & GF_AFTER_V7))
-		charset._ignoreCharsetMask = 1;
+	// Verb text should never time out.
+	if (a == 4)
+		_talkDelay = -1;
 
 	if (!buf[0]) {
 		buf[0] = ' ';