From 32820b65e33e119e0bae3c747354c087c0694598 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 2 Nov 2006 04:36:05 +0000 Subject: [PATCH] use LuaThreadVariable --- stepmania/Themes/default/Scripts/Other.lua | 4 ++-- stepmania/src/Screen.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/Themes/default/Scripts/Other.lua b/stepmania/Themes/default/Scripts/Other.lua index 14a412cb95..2b86c3d1aa 100644 --- a/stepmania/Themes/default/Scripts/Other.lua +++ b/stepmania/Themes/default/Scripts/Other.lua @@ -50,12 +50,12 @@ end -- Get a metric from the currently-loading screen. This is only valid while loading -- an actor, such as from File or InitCommand attributes; not from commands. function ScreenMetric( sName ) - local sClass = LoadingScreen; + local sClass = Var "LoadingScreen"; return THEME:GetMetric( sClass, sName ) end function ScreenString( sName ) - local sClass = LoadingScreen; + local sClass = Var "LoadingScreen"; return THEME:GetString( sClass, sName ) end diff --git a/stepmania/src/Screen.h b/stepmania/src/Screen.h index e1f5938334..5ea34964d9 100644 --- a/stepmania/src/Screen.h +++ b/stepmania/src/Screen.h @@ -16,7 +16,7 @@ void RegisterScreenClass( const RString& sClassName, CreateScreenFn pfn ); // Each Screen class should have a REGISTER_SCREEN_CLASS in its CPP file. #define REGISTER_SCREEN_CLASS( className ) \ - static Screen* Create##className( const RString &sName ) { Screen *pRet = new className; pRet->SetName( sName ); Screen::InitScreen( pRet ); return pRet; } \ + static Screen* Create##className( const RString &sName ) { LuaThreadVariable var( "LoadingScreen", sName ); Screen *pRet = new className; pRet->SetName( sName ); Screen::InitScreen( pRet ); return pRet; } \ struct Register##className { \ Register##className() { RegisterScreenClass( #className,Create##className); } \ }; \