From 04b1490b513b15b7d733ac53400b7ba8a7eaf555 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 20 Oct 2006 09:43:56 +0000 Subject: [PATCH] faster, more reliable error checking --- stepmania/src/NoteDisplay.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stepmania/src/NoteDisplay.cpp b/stepmania/src/NoteDisplay.cpp index 22c835e868..12d8a12e46 100644 --- a/stepmania/src/NoteDisplay.cpp +++ b/stepmania/src/NoteDisplay.cpp @@ -138,11 +138,9 @@ static NoteResource *MakeNoteResource( const RString &sButton, const RString &sE /* Make sure pActor is a Sprite (or something derived from Sprite). */ if( bSpriteOnly ) { - Lua *L = LUA->Get(); - pRes->m_pActor->PushSelf( L ); - Luna::check( L, lua_gettop(L) ); - lua_pop( L, 1 ); - LUA->Release( L ); + Sprite *pSprite = dynamic_cast( pRes->m_pActor ); + if( pSprite == NULL ) + RageException::Throw( "%s: must be a Sprite", nsap.sPath.c_str() ); } g_NoteResource[nsap] = pRes; @@ -193,7 +191,9 @@ Actor *MakeRefcountedActor( const RString &sButton, const RString &sElement ) Sprite *MakeRefcountedSprite( const RString &sButton, const RString &sElement ) { NoteResource *pRes = MakeNoteResource( sButton, sElement, true ); - return (Sprite *) pRes->m_pActor; /* XXX ick */ + Sprite *pSprite = dynamic_cast( pRes->m_pActor ); + ASSERT( pSprite != NULL ); + return pSprite; } NoteColorActor::NoteColorActor()