[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.115,1.116 display.cpp,1.56,1.57 display.h,1.40,1.41 queen.cpp,1.75,1.76 queen.h,1.28,1.29
Gregory Montoir
cyx at users.sourceforge.net
Thu Jan 15 13:08:02 CET 2004
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv18024/queen
Modified Files:
cutaway.cpp display.cpp display.h queen.cpp queen.h
Log Message:
got rid of timer stuff to handle display sync
Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- cutaway.cpp 14 Jan 2004 15:51:54 -0000 1.115
+++ cutaway.cpp 15 Jan 2004 21:07:17 -0000 1.116
@@ -745,6 +745,7 @@
// XXX loadnoplay=1;
// XXX playsong(abs(OBJ_ANIM[J][11]));
// XXX loadnoplay=0;
+ warning("Cutaway::handleAnimation() song %d not handled", ABS(objAnim[i].song));
}
} // for()
Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- display.cpp 14 Jan 2004 14:34:04 -0000 1.56
+++ display.cpp 15 Jan 2004 21:07:17 -0000 1.57
@@ -154,7 +154,7 @@
_system->set_palette(tempPal + start * 4, start, end - start + 1);
if (updateScreen) {
_system->update_screen();
- waitForTimer();
+ _vm->input()->delay(20);
}
}
@@ -613,7 +613,6 @@
debug(7, "Display::update() - Dirtyblocks blit (%d)", count);
}
_system->update_screen();
- waitForTimer();
}
void Display::setupPanel() {
@@ -768,17 +767,6 @@
}
}
-void Display::handleTimer() {
- _gotTick = true;
-}
-
-void Display::waitForTimer() {
- _gotTick = false;
- while (!_gotTick) {
- _vm->input()->delay(10);
- }
-}
-
void Display::setMouseCursor(uint8 *buf, uint16 w, uint16 h) {
assert(w == 14 && h == 14);
uint16 size = 14 * 14;
@@ -966,7 +954,7 @@
}
_system->copy_rect(buf, 32, x, y, 32, 32);
_system->update_screen();
- waitForTimer();
+ _vm->input()->delay(10);
}
}
}
@@ -999,7 +987,7 @@
}
_system->copy_rect(buf, SCREEN_W, x, y, 2, 2);
_system->update_screen();
- waitForTimer();
+ _vm->input()->delay(10);
}
}
@@ -1028,7 +1016,7 @@
_system->copy_rect(buf, SCREEN_W, x, y, 2, 2);
}
_system->update_screen();
- waitForTimer();
+ _vm->input()->delay(10);
}
}
Index: display.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- display.h 11 Jan 2004 17:20:29 -0000 1.40
+++ display.h 15 Jan 2004 21:07:17 -0000 1.41
@@ -82,9 +82,6 @@
void setDirtyBlock(uint16 x, uint16 y, uint16 w, uint16 h);
void forceFullRefresh() { _fullRefresh = 2; }
- void handleTimer();
- void waitForTimer();
-
void setMouseCursor(uint8 *buf, uint16 w, uint16 h);
void showMouseCursor(bool show);
Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- queen.cpp 13 Jan 2004 14:43:13 -0000 1.75
+++ queen.cpp 15 Jan 2004 21:07:17 -0000 1.76
@@ -101,7 +101,6 @@
}
QueenEngine::~QueenEngine() {
- _timer->removeTimerProc(&timerHandler);
delete _bam;
delete _resource;
delete _bankMan;
@@ -362,13 +361,7 @@
_music = new Music(driver, this);
_sound = Sound::giveSound(_mixer, this, _resource->compression());
_walk = new Walk(this);
- _timer->installTimerProc(&timerHandler, 1000000 / 50, this); //call 50 times per second
_saveFileMan = _system->get_savefile_manager();
}
-void QueenEngine::timerHandler(void *ptr) {
- QueenEngine *vm = (QueenEngine *)ptr;
- vm->_display->handleTimer();
-}
-
} // End of namespace Queen
Index: queen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- queen.h 12 Jan 2004 13:40:01 -0000 1.28
+++ queen.h 15 Jan 2004 21:07:17 -0000 1.29
@@ -102,8 +102,6 @@
void initialise();
- static void timerHandler(void *ptr);
-
int _talkSpeed;
bool _subtitles;
More information about the Scummvm-git-logs
mailing list