From 29f97b8dfa44d7422d3bfc3884c61130a18d29fe Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sat, 18 Feb 2006 23:51:21 +0000 Subject: [PATCH] This is a metrics error. --- stepmania/src/ScreenManager.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index e0c55429d3..1884a849b2 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -497,17 +497,18 @@ Screen* ScreenManager::MakeNewScreen( const RString &sScreenName ) RageTimer t; LOG->Trace( "Loading screen name '%s'", sScreenName.c_str() ); - RString sClassName = THEME->GetMetric(sScreenName,"Class"); + RString sClassName = THEME->GetMetric( sScreenName,"Class" ); map::iterator iter = g_pmapRegistrees->find( sClassName ); - ASSERT_M( iter != g_pmapRegistrees->end(), ssprintf("Screen '%s' has an invalid class '%s'",sScreenName.c_str(),sClassName.c_str()) ); + if( iter == g_pmapRegistrees->end() ) + RageException::Throw( "Screen '%s' has an invalid class '%s'", sScreenName.c_str(), sClassName.c_str() ); this->ZeroNextUpdate(); CreateScreenFn pfn = iter->second; - Screen* ret = pfn( sScreenName ); + Screen *ret = pfn( sScreenName ); - LOG->Trace( "Loaded '%s' ('%s') in %f", sScreenName.c_str(), sClassName.c_str(), t.GetDeltaTime()); + LOG->Trace( "Loaded '%s' ('%s') in %f", sScreenName.c_str(), sClassName.c_str(), t.GetDeltaTime() ); return ret; }