[Scummvm-cvs-logs] SF.net SVN: scummvm: [29098] residual/trunk/main.cpp

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Tue Sep 25 20:32:54 CEST 2007


Revision: 29098
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29098&view=rev
Author:   eriktorbjorn
Date:     2007-09-25 11:32:53 -0700 (Tue, 25 Sep 2007)

Log Message:
-----------
Just draw the splash screen, even if there isn't any SDL_VIDEOEXPOSE event. The
event didn't happen with Mac OS X (this was already worked around) or with the
TinyGL driver. Maybe the purpose was to keep the screen updated during the
initialisation of the game, but the initialisation wouldn't begin until after
the loop had terminated anyway.

Modified Paths:
--------------
    residual/trunk/main.cpp

Modified: residual/trunk/main.cpp
===================================================================
--- residual/trunk/main.cpp	2007-09-25 15:58:44 UTC (rev 29097)
+++ residual/trunk/main.cpp	2007-09-25 18:32:53 UTC (rev 29098)
@@ -181,25 +181,12 @@
 	if (splash_bm != NULL)
 		splash_bm->ref();
 
-	SDL_Event event;
-	
-// For some reason we don't get the SDL_VIDEOEXPOSE event on OSX, so just don't wait for it.
-#ifndef MACOSX
-	while (SDL_PollEvent(&event)) {
-		if (event.type == SDL_VIDEOEXPOSE) {
-#else
-	SDL_PollEvent(&event);
-#endif	
-			g_driver->clearScreen();
+	g_driver->clearScreen();
 
-			if (!(g_flags & GF_DEMO))
-				splash_bm->draw();
+	if (!(g_flags & GF_DEMO))
+		splash_bm->draw();
 
-			g_driver->flipBuffer();
-#ifndef MACOSX
-		}
-	}
-#endif
+	g_driver->flipBuffer();
 
 	if (splash_bm != NULL)
 		splash_bm->deref();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list