From a8b065b91936ae6b2463204efc06ea9590abec53 Mon Sep 17 00:00:00 2001 From: Jonathan Payne Date: Tue, 14 Dec 2010 00:30:35 -0800 Subject: [PATCH] fix up PaneDisplay not clamping any value less than 0, higher than 100% --- .hgignore | 1 + Themes/default/Graphics/PaneDisplay text.lua | 2 +- Themes/default/metrics.ini | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.hgignore b/.hgignore index f26a23553c..61c47b6743 100644 --- a/.hgignore +++ b/.hgignore @@ -45,3 +45,4 @@ Data/SpeedMods.txt syntax: regexp .*\#.*\#$ +glob:Cache/Banners/AdditionalSongs_Airspace Preview_Derailed_Derailed bn.png diff --git a/Themes/default/Graphics/PaneDisplay text.lua b/Themes/default/Graphics/PaneDisplay text.lua index adfa819e43..e0277a18df 100644 --- a/Themes/default/Graphics/PaneDisplay text.lua +++ b/Themes/default/Graphics/PaneDisplay text.lua @@ -78,7 +78,7 @@ local function CreatePaneDisplayGraph( _pnPlayer, _sLabel, _rcRadarCategory ) else self:stoptweening(); self:decelerate(0.2); - self:zoomtowidth( GetRadarData( _pnPlayer, _rcRadarCategory ) * 50 ); + self:zoomtowidth( clamp(GetRadarData( _pnPlayer, _rcRadarCategory ) * 50,0,50) ); end end; }; diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 6acac403ab..7b9a1b9238 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -1332,6 +1332,11 @@ ShowNumCourseSongs=true # UsePlayerSelectMenu=false SelectMenuAvailable=false +# +ShowPaneDisplayFrameP1=false +ShowPaneDisplayTextP1=false +ShowPaneDisplayFrameP2=false +ShowPaneDisplayTextP2=false [ScreenNetSelectMusic] StepsDisplayP1X=SCREEN_CENTER_X-240 StepsDisplayP1Y=SCREEN_CENTER_Y+185