[Scummvm-cvs-logs] CVS: scummvm/sky screen.cpp,1.48.2.1,1.48.2.2 screen.h,1.12.2.1,1.12.2.2

Nicolas Bacca arisme at users.sourceforge.net
Wed Aug 6 03:03:03 CEST 2003


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv18620

Modified Files:
      Tag: branch-0-5-0
	screen.cpp screen.h 
Log Message:
Fix #783732 : freeze on Pocket PC

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.cpp,v
retrieving revision 1.48.2.1
retrieving revision 1.48.2.2
diff -u -d -r1.48.2.1 -r1.48.2.2
--- screen.cpp	6 Aug 2003 02:13:00 -0000	1.48.2.1
+++ screen.cpp	6 Aug 2003 10:02:44 -0000	1.48.2.2
@@ -365,6 +365,15 @@
 	}
 }
 
+void SkyScreen::waitForSequence(void) {
+	while (_seqInfo.running) {
+		OSystem::Event event;
+
+		_system->delay_msecs(20);
+		while (_system->poll_event(&event));
+	}
+}
+
 void SkyScreen::handleTimer(void) {
 
 	_gotTick = true;

Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.h,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -d -r1.12.2.1 -r1.12.2.2
--- screen.h	6 Aug 2003 02:13:01 -0000	1.12.2.1
+++ screen.h	6 Aug 2003 10:02:44 -0000	1.12.2.2
@@ -66,7 +66,7 @@
 	void startSequenceItem(uint16 itemNum);
 	void stopSequence(void);
 	bool sequenceRunning(void) { return _seqInfo.running; };
-	void waitForSequence(void) { while (_seqInfo.running) _system->delay_msecs(20); };
+	void waitForSequence(void);
 	uint32 seqFramesLeft(void) { return _seqInfo.framesLeft; };
 	uint8 *giveCurrent(void) { return _currentScreen; };
 	void halvePalette(void);





More information about the Scummvm-git-logs mailing list