aboutsummaryrefslogtreecommitdiff
path: root/queen
diff options
context:
space:
mode:
authorTorbjörn Andersson2003-10-17 08:40:48 +0000
committerTorbjörn Andersson2003-10-17 08:40:48 +0000
commit40b231e6fedd344ee98337749b930c2d68d5463b (patch)
treee18233e46ccc6f425fc361f6278ae7a7fd953b80 /queen
parente00c16b4a97753b519e79d8f37664d6eb0ca0b52 (diff)
downloadscummvm-rg350-40b231e6fedd344ee98337749b930c2d68d5463b.tar.gz
scummvm-rg350-40b231e6fedd344ee98337749b930c2d68d5463b.tar.bz2
scummvm-rg350-40b231e6fedd344ee98337749b930c2d68d5463b.zip
Hack for allowing ScummVM to respond to events during while the intro is
playing. I apologize for adding a global variable, but for now that seemed like the least intrusive change. svn-id: r10845
Diffstat (limited to 'queen')
-rw-r--r--queen/graphics.cpp2
-rw-r--r--queen/queen.cpp4
-rw-r--r--queen/queen.h6
3 files changed, 10 insertions, 2 deletions
diff --git a/queen/graphics.cpp b/queen/graphics.cpp
index 01046b994e..ab33cccd09 100644
--- a/queen/graphics.cpp
+++ b/queen/graphics.cpp
@@ -696,7 +696,7 @@ void Graphics::update() {
_display->prepareUpdate();
bobDrawAll();
textDrawAll();
- g_system->delay_msecs(100);
+ g_queen->delay(100);
_display->palCustomScroll(0); //_currentRoom
_display->update(_bobs[0].active, _bobs[0].x, _bobs[0].y);
}
diff --git a/queen/queen.cpp b/queen/queen.cpp
index 7cd0bfde06..cfbbac8642 100644
--- a/queen/queen.cpp
+++ b/queen/queen.cpp
@@ -59,8 +59,12 @@ REGISTER_PLUGIN("Flight of the Amazon Queen", Engine_QUEEN_targetList, Engine_QU
namespace Queen {
+QueenEngine *g_queen;
+
QueenEngine::QueenEngine(GameDetector *detector, OSystem *syst)
: Engine(detector, syst) {
+
+ g_queen = this;
_game = detector->_game.id;
diff --git a/queen/queen.h b/queen/queen.h
index 68e97ece72..51fc6fe2e2 100644
--- a/queen/queen.h
+++ b/queen/queen.h
@@ -62,10 +62,11 @@ public:
QueenEngine(GameDetector *detector, OSystem *syst);
virtual ~QueenEngine();
+ void delay(uint amount);
+
protected:
byte _fastMode;
- void delay(uint amount);
void go();
//! Called when we go from one room to another
@@ -76,6 +77,9 @@ protected:
static int CDECL game_thread_proc(void *param);
};
+// XXX: Temporary hack to allow Graphics to call delay()
+extern QueenEngine *g_queen;
+
} // End of namespace Queen
#endif