fix this ScreenString debacle once and for all

2011-06-13 13:39:37 -05:00
parent d8e1296b5b
commit 6e19262e29
3 changed files with 3 additions and 18 deletions
@@ -20,12 +20,4 @@ local _screen = {
 	h  = SCREEN_HEIGHT,
 	cx = SCREEN_CENTER_X,
 	cy = SCREEN_CENTER_Y
-}
-
-if Screen.String then
-	ScreenString = Screen.String
-end
-
-if Screen.Metric then
-	ScreenMetric = Screen.Metric
-end
+}
@@ -56,15 +56,6 @@ function ActorScroller:setfastcatchup(bFastCatchup)
 	self:SetFastCatchup(bFastCatchup)
 end

-- renaming various StepMania functions to sm-ssc ones:
-if ScreenString then
-	ScreenString = Screen.String
-end
-
-if ScreenMetric then
-	ScreenMetric = Screen.Metric
-end
-
 --[[ GameState ]]
 --Aliases for old GAMESTATE timing functions.
 --These have been converted to SongPosition, but most themes still use these old functions.
@@ -102,11 +102,13 @@ Screen.Metric = function ( sName )
 	local sClass = Var "LoadingScreen"
 	return THEME:GetMetric( sClass, sName )
 end
+ScreenMetric = Screen.Metric

 Screen.String = function ( sName )
 	local sClass = Var "LoadingScreen";
 	return THEME:GetString( sClass, sName )
 end
+ScreenString = Screen.String

 function TextBannerAfterSet(self,param) 
 	local Title=self:GetChild("Title");