Minor fix for shrink fade.

Removed not working fade in (i'll work on that).

SVN-Revision: 1356

diff --git a/src/screen.cpp b/src/screen.cpp
index 8dfe18b..8e99e9b 100644 (file)
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -96,48 +96,6 @@ void drawgradient(Color top_clr, Color bot_clr)
 #endif
 }
 
-/* --- FADE IN --- */
-
-/** Fades the given surface into a black one. If fade_out is true, it will fade out, else
-it will fade in */
-
-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);
-fade(sur, seconds, fade_out);
-delete sur;
-}
-
-void fade(Surface *surface, int seconds, bool fade_out)
-{
-float alpha;
-if (fade_out)
-  alpha = 0;
-else
-  alpha = 255;
-
-  int cur_time, old_time;
-  cur_time = SDL_GetTicks();
-
-  while(alpha >= 0 && alpha < 256)
-    {
-    surface->draw(0,0,(int)alpha);
-    flipscreen();
-
-    old_time = cur_time;
-    cur_time = SDL_GetTicks();
-
-    /* Calculate the next alpha value */
-    float calc = (float) ((cur_time - old_time) / seconds);
-    if(fade_out)
-      alpha += 255 * calc;
-    else
-      alpha -= 255 * calc;
-    }
-}
-
 /** This fade shrinks to the given point */
 
 #define LOOP_DELAY 20
@@ -161,7 +119,7 @@ while(left_cor < point.x && right_cor < screen->w - point.x &&
   fillrect(0, 0, left_cor, screen->h, 0,0,0);  // left side
   fillrect(screen->w - right_cor, 0, right_cor, screen->h, 0,0,0);  // right side
   fillrect(0, 0, screen->w, up_cor, 0,0,0);  // up side
-  fillrect(0, screen->h - down_cor, screen->w, down_cor, 0,0,0);  // down side
+  fillrect(0, screen->h - down_cor, screen->w, down_cor+1, 0,0,0);  // down side
 
   flipscreen();
   SDL_Delay(LOOP_DELAY);

diff --git a/src/screen.h b/src/screen.h
index a786cc9..466fe7e 100644 (file)
--- a/src/screen.h
+++ b/src/screen.h
@@ -67,8 +67,6 @@ void drawline(int x1, int y1, int x2, int y2, int r, int g, int b, int a);
 void clearscreen(int r, int g, int b);
 void drawgradient(Color top_clr, Color bot_clr);
 void fillrect(float x, float y, float w, float h, int r, int g, int b, int a = 255);
-//void black_fade(Surface* surface, int seconds, bool fade_out);
-void fade(const std::string& surface, int seconds, bool fade_out);
 void shrink_fade(Point point, int fade_time);
 void updatescreen(void);
 void flipscreen(void);