[Scummvm-cvs-logs] CVS: scummvm/queen graphics.cpp,1.22,1.23 queen.cpp,1.14,1.15 queen.h,1.8,1.9

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv15957

Modified Files:
	graphics.cpp queen.cpp queen.h 
Log Message:
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.


Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- graphics.cpp	16 Oct 2003 16:55:13 -0000	1.22
+++ graphics.cpp	17 Oct 2003 08:40:48 -0000	1.23
@@ -696,7 +696,7 @@
 	_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);
 }

Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- queen.cpp	17 Oct 2003 03:59:55 -0000	1.14
+++ queen.cpp	17 Oct 2003 08:40:48 -0000	1.15
@@ -59,8 +59,12 @@
 
 namespace Queen {
 
+QueenEngine *g_queen;
+
 QueenEngine::QueenEngine(GameDetector *detector, OSystem *syst)
 	: Engine(detector, syst) {
+
+	g_queen = this;
 	
 	_game = detector->_game.id;
 

Index: queen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- queen.h	16 Oct 2003 19:40:29 -0000	1.8
+++ queen.h	17 Oct 2003 08:40:48 -0000	1.9
@@ -62,10 +62,11 @@
 	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
@@ -75,6 +76,9 @@
 
 	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