[Scummvm-cvs-logs] CVS: scummvm/saga puzzle.cpp,1.15,1.16 puzzle.h,1.6,1.7

[Torbjörn Andersson]

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

Modified Files:
	puzzle.cpp puzzle.h 
Log Message:
Fixed overlapping speech in ferret puzzle. See bug #1260904.


Index: puzzle.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/puzzle.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- puzzle.cpp	16 Aug 2005 13:13:27 -0000	1.15
+++ puzzle.cpp	2 Oct 2005 13:49:58 -0000	1.16
@@ -477,7 +477,17 @@
 
 	Common::g_timer->removeTimerProc(&hintTimerCallback);
 
-	switch(_hintRqState) {
+	switch (_hintRqState) {
+	case kRQSpeaking:
+		if (_vm->_actor->isSpeaking()) {
+			Common::g_timer->installTimerProc(&hintTimerCallback, 50000, this);
+			break;
+		}
+
+		_hintRqState = _hintNextRqState;
+		Common::g_timer->installTimerProc(&hintTimerCallback, 333333, this);
+		break;
+
 	case kRQNoHint:
 		//	Pick a random hint request.
 		i = _hintOffer++;
@@ -500,8 +510,9 @@
 			_hintRqState = kRQSakkaDenies;
 			Common::g_timer->installTimerProc(&hintTimerCallback, 200000, this);
 		} else {
-			_hintRqState = kRQHintRequested;
-			Common::g_timer->installTimerProc(&hintTimerCallback, 400000, this);
+			_hintRqState = kRQSpeaking;
+			_hintNextRqState = kRQHintRequested;
+			Common::g_timer->installTimerProc(&hintTimerCallback, 50000, this);
 		}
 
 		break;
@@ -512,8 +523,9 @@
 
 		_vm->_interface->setRightPortrait(RID_ITE_SAKKA_APPRAISING);
 
-		_hintRqState = kRQHintRequestedStage2;
-		Common::g_timer->installTimerProc(&hintTimerCallback, 400000, this);
+		_hintRqState = kRQSpeaking;
+		_hintNextRqState = kRQHintRequestedStage2;
+		Common::g_timer->installTimerProc(&hintTimerCallback, 50000, this);
 
 		_vm->_interface->converseClear();
 		_vm->_interface->converseAddText(optionsStr[_lang][kROAccept], 1, 0, 0 );

Index: puzzle.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/puzzle.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- puzzle.h	30 Jul 2005 21:11:21 -0000	1.6
+++ puzzle.h	2 Oct 2005 13:49:58 -0000	1.7
@@ -40,7 +40,8 @@
 		kRQHintRequested = 1,
 		kRQHintRequestedStage2 = 2,
 		kRQSakkaDenies = 3,
-		kRQSkipEverything = 4
+		kRQSkipEverything = 4,
+		kRQSpeaking = 5
 	};
 
 	SagaEngine *_vm;
@@ -51,6 +52,7 @@
 	bool _sliding;
 
 	kRQStates _hintRqState;
+	kRQStates _hintNextRqState;
 	int _hintGiver;
 	int _hintSpeaker;
 	int _hintOffer;