restore trunk

[supertux.git] / src / object / display_effect.cpp

diff --git a/src/object/display_effect.cpp b/src/object/display_effect.cpp
index a01e9db..acf52bf 100644 (file)
--- a/src/object/display_effect.cpp
+++ b/src/object/display_effect.cpp
@@ -84,7 +84,8 @@ DisplayEffect::update(float elapsed_time)
     if(border_fading < 0) {
       border_fade = NO_FADE;
     }
-    border_size = border_fading / border_fading * BORDER_SIZE;
+    border_size = (border_fadetime - border_fading)
+      / border_fadetime * BORDER_SIZE;
     break;
   case FADE_OUT:
     border_fading -= elapsed_time;
@@ -92,8 +93,7 @@ DisplayEffect::update(float elapsed_time)
       borders = false;
       border_fade = NO_FADE;
     }
-    border_size = (border_fadetime - border_fading)
-      / border_fadetime * BORDER_SIZE;
+    border_size = border_fading / border_fadetime * BORDER_SIZE;
     break;
   default:
     assert(false);