[Scummvm-cvs-logs] SF.net SVN: scummvm:[49771] scummvm/trunk/engines/saga
sev at users.sourceforge.net
sev at users.sourceforge.net
Tue Jun 15 12:50:49 CEST 2010
Revision: 49771
http://scummvm.svn.sourceforge.net/scummvm/?rev=49771&view=rev
Author: sev
Date: 2010-06-15 10:50:49 +0000 (Tue, 15 Jun 2010)
Log Message:
-----------
SAGA: fix timers.
Second parameter to intallTimerCallback is in _micro_seconds.
Correct calls which assumed milliseconds.
Modified Paths:
--------------
scummvm/trunk/engines/saga/music.cpp
scummvm/trunk/engines/saga/puzzle.cpp
Modified: scummvm/trunk/engines/saga/music.cpp
===================================================================
--- scummvm/trunk/engines/saga/music.cpp 2010-06-15 10:50:28 UTC (rev 49770)
+++ scummvm/trunk/engines/saga/music.cpp 2010-06-15 10:50:49 UTC (rev 49771)
@@ -234,7 +234,7 @@
return;
}
- _vm->getTimerManager()->installTimerProc(&musicVolumeGaugeCallback, time * 100L, this);
+ _vm->getTimerManager()->installTimerProc(&musicVolumeGaugeCallback, time * 3000L, this);
}
bool Music::isPlaying() {
Modified: scummvm/trunk/engines/saga/puzzle.cpp
===================================================================
--- scummvm/trunk/engines/saga/puzzle.cpp 2010-06-15 10:50:28 UTC (rev 49770)
+++ scummvm/trunk/engines/saga/puzzle.cpp 2010-06-15 10:50:49 UTC (rev 49771)
@@ -411,12 +411,12 @@
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 @@
// 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 @@
_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 );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list