aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2010-06-15 10:50:49 +0000
committerEugene Sandulenko2010-06-15 10:50:49 +0000
commit9d4d191baa0eafcdd470f33bd589e204bd8e5863 (patch)
tree2f4b2d28aac5e9713faf8b00895b2c7113bb64e4 /engines
parentef36b80dfa120edb4648b3f1f7409fc858ba4712 (diff)
downloadscummvm-rg350-9d4d191baa0eafcdd470f33bd589e204bd8e5863.tar.gz
scummvm-rg350-9d4d191baa0eafcdd470f33bd589e204bd8e5863.tar.bz2
scummvm-rg350-9d4d191baa0eafcdd470f33bd589e204bd8e5863.zip
SAGA: fix timers.
Second parameter to intallTimerCallback is in _micro_seconds. Correct calls which assumed milliseconds. svn-id: r49771
Diffstat (limited to 'engines')
-rw-r--r--engines/saga/music.cpp2
-rw-r--r--engines/saga/puzzle.cpp10
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index f38e47dc48..8b8f26d5a0 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -234,7 +234,7 @@ void Music::setVolume(int volume, int time) {
return;
}
- _vm->getTimerManager()->installTimerProc(&musicVolumeGaugeCallback, time * 100L, this);
+ _vm->getTimerManager()->installTimerProc(&musicVolumeGaugeCallback, time * 3000L, this);
}
bool Music::isPlaying() {
diff --git a/engines/saga/puzzle.cpp b/engines/saga/puzzle.cpp
index 957ab3c8b6..5b13473d77 100644
--- a/engines/saga/puzzle.cpp
+++ b/engines/saga/puzzle.cpp
@@ -411,12 +411,12 @@ void Puzzle::solicitHint() {
switch (_hintRqState) {
case kRQSpeaking:
if (_vm->_actor->isSpeaking()) {
- _vm->getTimerManager()->installTimerProc(&hintTimerCallback, 50000, this);
+ _vm->getTimerManager()->installTimerProc(&hintTimerCallback, 50 * 1000000, this);
break;
}
_hintRqState = _hintNextRqState;
- _vm->getTimerManager()->installTimerProc(&hintTimerCallback, 333333, this);
+ _vm->getTimerManager()->installTimerProc(&hintTimerCallback, 100*1000000/3, this);
break;
case kRQNoHint:
@@ -439,11 +439,11 @@ void Puzzle::solicitHint() {
// Roll to see if Sakka scolds
if (_vm->_rnd.getRandomNumber(1)) {
_hintRqState = kRQSakkaDenies;
- _vm->getTimerManager()->installTimerProc(&hintTimerCallback, 200000, this);
+ _vm->getTimerManager()->installTimerProc(&hintTimerCallback, 200*1000000, this);
} else {
_hintRqState = kRQSpeaking;
_hintNextRqState = kRQHintRequested;
- _vm->getTimerManager()->installTimerProc(&hintTimerCallback, 50000, this);
+ _vm->getTimerManager()->installTimerProc(&hintTimerCallback, 50*1000000, this);
}
break;
@@ -456,7 +456,7 @@ void Puzzle::solicitHint() {
_hintRqState = kRQSpeaking;
_hintNextRqState = kRQHintRequestedStage2;
- _vm->getTimerManager()->installTimerProc(&hintTimerCallback, 50000, this);
+ _vm->getTimerManager()->installTimerProc(&hintTimerCallback, 50*1000000, this);
_vm->_interface->converseClear();
_vm->_interface->converseAddText(optionsStr[_lang][kROAccept], 0, 1, 0, 0 );