- increased Tux's safe time to 1250ms

[supertux.git] / src / screen.cpp

diff --git a/src/screen.cpp b/src/screen.cpp
index bf9eb89..df1b53f 100644 (file)
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -105,7 +105,7 @@ void fade(Surface *surface, int seconds, bool fade_out);
 void fade(const std::string& surface, int seconds, bool fade_out)
 {
 Surface* sur = new Surface(datadir + surface, IGNORE_ALPHA);
-black_fade(sur, seconds, fade_out);
+fade(sur, seconds, fade_out);
 delete sur;
 }
 
@@ -122,11 +122,12 @@ else
 
   while(alpha >= 0 && alpha < 256)
     {
+    surface->draw(0,0,(int)alpha);
+    flipscreen();
+
     old_time = cur_time;
     cur_time = SDL_GetTicks();
 
-    surface->draw(0,0,(int)alpha, true);
-
     /* Calculate the next alpha value */
     float calc = (float) ((cur_time - old_time) / seconds);
     if(fade_out)