Ticket #2158: ite-puzzle.diff

saga/puzzle.cpp

@@ -477 +477 @@
 
         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 +510 @@
                         _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 +523 @@
 
                 _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 );

saga/puzzle.h

@@ -40 +40 @@
                 kRQHintRequested = 1,
                 kRQHintRequestedStage2 = 2,
                 kRQSakkaDenies = 3,
-                kRQSkipEverything = 4
+                kRQSkipEverything = 4,
+                kRQSpeaking = 5
         };
 
         SagaEngine *_vm;
@@ -51 +52 @@
         bool _sliding;
 
         kRQStates _hintRqState;
+        kRQStates _hintNextRqState;
         int _hintGiver;
         int _hintSpeaker;
         int _hintOffer;