[Scummvm-cvs-logs] CVS: scummvm/queen display.h,1.15,1.16 display.cpp,1.19,1.20 queen.cpp,1.26,1.27
Gregory Montoir
cyx at users.sourceforge.net
Sat Nov 1 13:21:10 CET 2003
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv28536
Modified Files:
display.h display.cpp queen.cpp
Log Message:
use input->delay instead of system->delay
Index: display.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- display.h 1 Nov 2003 20:46:35 -0000 1.15
+++ display.h 1 Nov 2003 21:20:36 -0000 1.16
@@ -63,7 +63,7 @@
class Display {
public:
- Display(OSystem *system);
+ Display(OSystem *system, Input *input);
~Display();
void dynalumInit(Resource *resource, const char *roomName, uint16 roomNum);
@@ -144,6 +144,7 @@
Dynalum _dynalum;
OSystem *_system;
+ Input *_input;
static const uint8 PAL_JOE_CLOTHES[];
static const uint8 PAL_JOE_DRESS[];
Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- display.cpp 1 Nov 2003 20:46:35 -0000 1.19
+++ display.cpp 1 Nov 2003 21:20:36 -0000 1.20
@@ -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 @@
-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 @@
_gotTick = false;
while (!_gotTick) {
- // FIXME: use _input->delay() instead
- OSystem::Event event;
-
- _system->delay_msecs(10);
- while (_system->poll_event(&event));
+ _input->delay(10);
}
}
Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- queen.cpp 31 Oct 2003 13:47:27 -0000 1.26
+++ queen.cpp 1 Nov 2003 21:20:36 -0000 1.27
@@ -211,8 +211,8 @@
void QueenEngine::initialise(void) {
_resource = new Resource(_gameDataPath, _detector->_game.detectname);
- _display = new Display(_system);
_input = new Input(_system);
+ _display = new Display(_system, _input);
_graphics = new Graphics(_display, _input, _resource);
_sound = Sound::giveSound(_mixer, _input, _resource, _resource->compression());
_logic = new Logic(_resource, _graphics, _display, _input, _sound);
More information about the Scummvm-git-logs
mailing list