aboutsummaryrefslogtreecommitdiff
path: root/queen/display.cpp
diff options
context:
space:
mode:
authorGregory Montoir2003-11-01 21:20:36 +0000
committerGregory Montoir2003-11-01 21:20:36 +0000
commit561d4c09d89986f010090c1893168611ba0774cf (patch)
treedfdaf5c72656f0ac293858860ce314b17c3b5979 /queen/display.cpp
parent72bee75297bb42703c5825027cd3a4c11dd9347a (diff)
downloadscummvm-rg350-561d4c09d89986f010090c1893168611ba0774cf.tar.gz
scummvm-rg350-561d4c09d89986f010090c1893168611ba0774cf.tar.bz2
scummvm-rg350-561d4c09d89986f010090c1893168611ba0774cf.zip
use input->delay instead of system->delay
svn-id: r11035
Diffstat (limited to 'queen/display.cpp')
-rw-r--r--queen/display.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/queen/display.cpp b/queen/display.cpp
index 871fa84b0e..6a483d6ac0 100644
--- a/queen/display.cpp
+++ b/queen/display.cpp
@@ -22,6 +22,7 @@
#include "stdafx.h"
#include "queen/display.h"
#include "queen/defs.h"
+#include "queen/input.h"
#include "queen/logic.h" // For RandomSource
#include "queen/resource.h"
@@ -100,8 +101,8 @@ void TextRenderer::drawChar(uint8 *dstBuf, uint16 dstPitch, uint16 x, uint16 y,
-Display::Display(OSystem *system)
- : _system(system) {
+Display::Display(OSystem *system, Input *input)
+ : _system(system), _input(input) {
_dynalum.prevColMask = 0xFF;
_textRenderer.init();
@@ -816,11 +817,7 @@ void Display::waitForTimer() {
_gotTick = false;
while (!_gotTick) {
- // FIXME: use _input->delay() instead
- OSystem::Event event;
-
- _system->delay_msecs(10);
- while (_system->poll_event(&event));
+ _input->delay(10);
}
}