libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 06:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed overlapping speech in ferret puzzle. See bug #1260904.

Browse Source 
svn-id: r18925
This commit is contained in:
Torbjörn Andersson 2005-10-02 13:49:58 +00:00
parent 4d9a2cb884
commit f912a940e9
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
saga/puzzle.cpp
View File

@ -477,7 +477,17 @@ void Puzzle::solicitHint(void) {
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 @@ void Puzzle::solicitHint(void) {
_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 @@ void Puzzle::solicitHint(void) {
_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 );

4
saga/puzzle.h
View File

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