[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,1.17,1.18 scumm.h,1.33,1.34 scummvm.cpp,1.46,1.47 verbs.cpp,1.2,1.3

[James Brown]

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

Modified Files:
	script_v2.cpp scumm.h scummvm.cpp verbs.cpp 
Log Message:
Patch #616092: Full Throttle dialog fix


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- script_v2.cpp	30 Sep 2002 06:04:50 -0000	1.17
+++ script_v2.cpp	1 Oct 2002 09:27:09 -0000	1.18
@@ -2077,6 +2077,12 @@
 	VerbSlot *vs;
 	byte *ptr, op;
 
+	// Full Throttle implements conversation by creating new verbs, one
+	// for each option, but it never tells when to actually draw them.
+
+	if (_gameId == GID_FT)
+		_verbRedraw = true;
+
 	op = fetchScriptByte();
 	if (op == 196) {
 		_curVerb = pop();

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- scumm.h	30 Sep 2002 00:55:47 -0000	1.33
+++ scumm.h	1 Oct 2002 09:27:09 -0000	1.34
@@ -756,7 +756,7 @@
 	uint32 _IM00_offs, _PALS_offs;
 
 	//ender: fullscreen
-	bool _fullRedraw, _BgNeedsRedraw, _shakeEnabled;
+	bool _fullRedraw, _BgNeedsRedraw, _shakeEnabled, _verbRedraw;
 	bool _screenEffectFlag, _completeScreenRedraw;
 
 	int _cursorHotspotX, _cursorHotspotY, _cursorWidth, _cursorHeight;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- scummvm.cpp	30 Sep 2002 06:04:50 -0000	1.46
+++ scummvm.cpp	1 Oct 2002 09:27:09 -0000	1.47
@@ -471,6 +471,10 @@
 		}
 
 		processDrawQue();
+
+		if (_verbRedraw)
+			redrawVerbs();
+		
 		setActorRedrawFlags(true, true);
 		resetActorBgs();
 
@@ -1480,6 +1484,8 @@
 	_maxHeapThreshold = 450000;
 	_minHeapThreshold = 400000;
 
+	_verbRedraw = false;
+	
 	// Create a primary virtual screen
 	_videoBuffer = (byte *)calloc((_realWidth + 8) * _realHeight, 1);
 

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- verbs.cpp	22 Sep 2002 01:17:53 -0000	1.2
+++ verbs.cpp	1 Oct 2002 09:27:09 -0000	1.3
@@ -31,6 +31,7 @@
 	for (i = 0; i < _maxVerbs; i++)
 		drawVerb(i, 0);
 	verbMouseOver(0);
+	_verbRedraw = false;
 }
 
 void Scumm::checkExecVerbs()