diff --git a/Themes/default/Graphics/ScreenMapControllers exit.lua b/Themes/default/Graphics/ScreenMapControllers exit.lua new file mode 100644 index 0000000000..dda8c0fd5c --- /dev/null +++ b/Themes/default/Graphics/ScreenMapControllers exit.lua @@ -0,0 +1,10 @@ +return LoadFont("Common Normal") .. { + Text="Exit"; + InitCommand=cmd(x,SCREEN_CENTER_X;zoom,0.75;shadowlength,0;diffuse,color("#880000");NoStroke); + OnCommand=cmd(diffusealpha,0;decelerate,0.5;diffusealpha,1); + OffCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,0;queuecommand,"Hide"); + HideCommand=cmd(hidden,true); + + GainFocusCommand=cmd(diffuseshift;effectcolor1,color("#FF2222");effectcolor2,color("#880000");); + LoseFocusCommand=cmd(stopeffect); +}; diff --git a/Themes/default/Graphics/ScreenMapControllers exit.redir b/Themes/default/Graphics/ScreenMapControllers exit.redir deleted file mode 100644 index 04b2ead777..0000000000 --- a/Themes/default/Graphics/ScreenMapControllers exit.redir +++ /dev/null @@ -1 +0,0 @@ -_blank \ No newline at end of file diff --git a/src/RageUtil.cpp b/src/RageUtil.cpp index b7eff99a24..d72a4780dd 100644 --- a/src/RageUtil.cpp +++ b/src/RageUtil.cpp @@ -92,7 +92,7 @@ int MersenneTwister::operator()() void fapproach( float& val, float other_val, float to_move ) { - ASSERT_M( to_move >= 0, ssprintf("to_move: %f", to_move) ); + ASSERT_M( to_move >= 0, ssprintf("to_move: %f < 0", to_move) ); if( val == other_val ) return; float fDelta = other_val - val;