[Scummvm-cvs-logs] CVS: scummvm/saga puzzle.cpp,1.4,1.5 saga.h,1.96,1.97
Eugene Sandulenko
sev at users.sourceforge.net
Sun May 29 14:02:12 CEST 2005
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1856
Modified Files:
puzzle.cpp saga.h
Log Message:
Fix puzzle callback timings. Was mistakingly used millisecs instead of microsecs
Index: puzzle.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/puzzle.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- puzzle.cpp 28 May 2005 11:06:55 -0000 1.4
+++ puzzle.cpp 29 May 2005 21:00:45 -0000 1.5
@@ -223,9 +223,9 @@
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 @@
// 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 @@
_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 );
Index: saga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.h,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- saga.h 29 May 2005 15:39:35 -0000 1.96
+++ saga.h 29 May 2005 21:00:45 -0000 1.97
@@ -108,7 +108,7 @@
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 {
More information about the Scummvm-git-logs
mailing list