diff options
| author | Eugene Sandulenko | 2005-05-29 21:00:45 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-05-29 21:00:45 +0000 |
| commit | b2250cca647271a45d20c6191fefb0f0da4c0ad1 (patch) | |
| tree | 1fd9c197a90065bacb82a59dbe1c1c8b744f9327 /saga | |
| parent | 5cd6d6b6f82a742b2b1e47fa4025b0c1b2eb29e8 (diff) | |
| download | scummvm-rg350-b2250cca647271a45d20c6191fefb0f0da4c0ad1.tar.gz scummvm-rg350-b2250cca647271a45d20c6191fefb0f0da4c0ad1.tar.bz2 scummvm-rg350-b2250cca647271a45d20c6191fefb0f0da4c0ad1.zip | |
Fix puzzle callback timings. Was mistakingly used millisecs instead of microsecs
svn-id: r18298
Diffstat (limited to 'saga')
| -rw-r--r-- | saga/puzzle.cpp | 12 | ||||
| -rw-r--r-- | saga/saga.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/saga/puzzle.cpp b/saga/puzzle.cpp index aeab8e3354..e02f715fb0 100644 --- a/saga/puzzle.cpp +++ b/saga/puzzle.cpp @@ -223,9 +223,9 @@ void Puzzle::initPieces(void) { void Puzzle::movePiece(Point mousePt) { } -void Puzzle::hintTimerCallback(void *refCon) { - ((Puzzle *)refCon)->solicitHint(); -} +void Puzzle::hintTimerCallback(void *refCon) { + ((Puzzle *)refCon)->solicitHint(); +} void Puzzle::solicitHint(void) { int i; @@ -254,10 +254,10 @@ void Puzzle::solicitHint(void) { // Roll to see if Sakka scolds if (_vm->_rnd.getRandomNumber(1)) { _hintRqState = kRQSakkaDenies; - Common::g_timer->installTimerProc(&hintTimerCallback, 200, this); + Common::g_timer->installTimerProc(&hintTimerCallback, 200000, this); } else { _hintRqState = kRQHintRequested; - Common::g_timer->installTimerProc(&hintTimerCallback, 400, this); + Common::g_timer->installTimerProc(&hintTimerCallback, 400000, this); } break; @@ -269,7 +269,7 @@ void Puzzle::solicitHint(void) { _vm->_interface->setRightPortrait(RID_ITE_SAKKA_APPRAISING); _hintRqState = kRQHintRequestedStage2; - Common::g_timer->installTimerProc(&hintTimerCallback, 400, this); + Common::g_timer->installTimerProc(&hintTimerCallback, 400000, this); _vm->_interface->converseClear(); _vm->_interface->converseAddText(optionsStr[_lang][kROAccept], 1, 0, 0 ); diff --git a/saga/saga.h b/saga/saga.h index 1fe95c1da8..087ced8354 100644 --- a/saga/saga.h +++ b/saga/saga.h @@ -108,7 +108,7 @@ enum ScriptTimings { kRepeatSpeed = 40, // 25 frames/sec kNormalFadeDuration = 320, // 64 steps, 5 msec each kQuickFadeDuration = 64, // 64 steps, 1 msec each - kPuzzleHintTime = 30000 // 30 secs + kPuzzleHintTime = 30000000L // 30 secs. used in timer }; enum Directions { |