fix this ScreenString debacle once and for all
This commit is contained in:
@@ -21,11 +21,3 @@ local _screen = {
|
|||||||
cx = SCREEN_CENTER_X,
|
cx = SCREEN_CENTER_X,
|
||||||
cy = SCREEN_CENTER_Y
|
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)
|
self:SetFastCatchup(bFastCatchup)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- renaming various StepMania functions to sm-ssc ones:
|
|
||||||
if ScreenString then
|
|
||||||
ScreenString = Screen.String
|
|
||||||
end
|
|
||||||
|
|
||||||
if ScreenMetric then
|
|
||||||
ScreenMetric = Screen.Metric
|
|
||||||
end
|
|
||||||
|
|
||||||
--[[ GameState ]]
|
--[[ GameState ]]
|
||||||
--Aliases for old GAMESTATE timing functions.
|
--Aliases for old GAMESTATE timing functions.
|
||||||
--These have been converted to SongPosition, but most themes still use these old 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"
|
local sClass = Var "LoadingScreen"
|
||||||
return THEME:GetMetric( sClass, sName )
|
return THEME:GetMetric( sClass, sName )
|
||||||
end
|
end
|
||||||
|
ScreenMetric = Screen.Metric
|
||||||
|
|
||||||
Screen.String = function ( sName )
|
Screen.String = function ( sName )
|
||||||
local sClass = Var "LoadingScreen";
|
local sClass = Var "LoadingScreen";
|
||||||
return THEME:GetString( sClass, sName )
|
return THEME:GetString( sClass, sName )
|
||||||
end
|
end
|
||||||
|
ScreenString = Screen.String
|
||||||
|
|
||||||
function TextBannerAfterSet(self,param)
|
function TextBannerAfterSet(self,param)
|
||||||
local Title=self:GetChild("Title");
|
local Title=self:GetChild("Title");
|
||||||
|
|||||||
Reference in New Issue
Block a user