rnd-20060816-4-src

* code cleanup of new fading functions

diff --git a/ChangeLog b/ChangeLog
index 53c04a0a269a08e5b22bc5f6cd0ace73668e90a9..c7fdd05a3558ed8a35e4910fb5497c08ee0f92d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-08-16
+       * code cleanup of new fading functions
+
 2006-08-15
        * changed behaviour after solved game -- do not immediately stop engine
        * added some more smooth screen fadings (game start, hall of fame etc.)

diff --git a/src/conftime.h b/src/conftime.h
index b6d2e6d09aa1431c1f24df7c5cb4d642149dec78..d6874f3ae233f34f7e04a233742145552778e5a1 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2006-08-16 22:29]"
+#define COMPILE_DATE_STRING "[2006-08-16 22:55]"

diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c
index 0b49269361786c66a276d69c78be4d887c238d6a..a0232fc9d8571d9e567ceada5691c9a849005e7e 100644 (file)
--- a/src/libgame/sdl.c
+++ b/src/libgame/sdl.c
@@ -389,7 +389,6 @@ void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height,
   SDL_Rect src_rect, dst_rect;
   int src_x = x, src_y = y;
   int dst_x = x, dst_y = y;
-  boolean fade_reverse = (fade_mode == FADE_MODE_FADE_IN ? TRUE : FALSE);
   unsigned int time_last, time_current;
   float alpha;
   int alpha_final;
@@ -463,13 +462,18 @@ void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height,
   /* copy source and target surfaces to temporary surfaces for fading */
   if (fade_mode == FADE_MODE_CROSSFADE)
   {
-    SDL_BlitSurface(surface_cross, &src_rect, surface_source, &src_rect);
+    SDL_BlitSurface(surface_cross,  &src_rect, surface_source, &src_rect);
     SDL_BlitSurface(surface_screen, &dst_rect, surface_target, &src_rect);
   }
-  else
+  else if (fade_mode == FADE_MODE_FADE_IN)
+  {
+    SDL_BlitSurface(surface_black,  &src_rect, surface_source, &src_rect);
+    SDL_BlitSurface(surface_screen, &dst_rect, surface_target, &src_rect);
+  }
+  else         /* FADE_MODE_FADE_OUT */
   {
     SDL_BlitSurface(surface_screen, &dst_rect, surface_source, &src_rect);
-    SDL_BlitSurface(surface_black, &src_rect, surface_target, &src_rect);
+    SDL_BlitSurface(surface_black,  &src_rect, surface_target, &src_rect);
   }
 
   time_current = SDL_GetTicks();
@@ -479,8 +483,7 @@ void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height,
     time_last = time_current;
     time_current = SDL_GetTicks();
     alpha += 255 * ((float)(time_current - time_last) / fade_delay);
-    alpha_final = (int)(fade_reverse ? 255.0 - alpha : alpha);
-    alpha_final = MIN(MAX(0, alpha_final), 255);
+    alpha_final = MIN(MAX(0, alpha), 255);
 
     /* draw existing (source) image to screen buffer */
     SDL_BlitSurface(surface_source, &src_rect, surface_screen, &dst_rect);