diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index b1b8fdadf1..d91f77f810 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -84,7 +84,7 @@ static Preference g_bDelayedScreenLoad( "DelayedScreenLoad", false ); // Screen registration static map *g_pmapRegistrees = NULL; -namespace +namespace ScreenManagerUtil { // // in draw order first to last @@ -210,6 +210,7 @@ namespace AfterDeleteScreen(); } }; +using namespace ScreenManagerUtil; void RegisterScreenClass( const RString& sClassName, CreateScreenFn pfn ) { @@ -921,7 +922,7 @@ public: } static int SystemMessage( T* p, lua_State *L ) { p->SystemMessage( SArg(1) ); return 0; } static int ConcurrentlyPrepareScreen( T* p, lua_State *L ) { p->ConcurrentlyPrepareScreen( SArg(1) ); return 0; } - static int ScreenIsPrepped( T* p, lua_State *L ) { lua_pushboolean( L, ::ScreenIsPrepped( SArg(1) ) ); return 1; } + static int ScreenIsPrepped( T* p, lua_State *L ) { lua_pushboolean( L, ScreenManagerUtil::ScreenIsPrepped( SArg(1) ) ); return 1; } static void Register(lua_State *L) {