X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fdisplay_effect.cpp;h=acf52bfc4a8e0ca6938b8eed5271ad173511ae84;hb=fea3446f05e1e7673607b835c269d3e8d1929ab3;hp=a01e9db502e2f5d6d9682ce276901c0660c0c4d9;hpb=4a486d92343d1824b311c234e9321e08f280fe68;p=supertux.git diff --git a/src/object/display_effect.cpp b/src/object/display_effect.cpp index a01e9db50..acf52bfc4 100644 --- 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);