From 7bc51fc0b07c52e1805d06b2d775f683b0d0459d Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 16 Aug 2006 18:44:16 +0000 Subject: [PATCH] optional attribute --- stepmania/src/ActorScroller.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/stepmania/src/ActorScroller.cpp b/stepmania/src/ActorScroller.cpp index 739c7467af..b47774dc02 100644 --- a/stepmania/src/ActorScroller.cpp +++ b/stepmania/src/ActorScroller.cpp @@ -108,20 +108,11 @@ void ActorScroller::LoadFromNode( const RString &sDir, const XNode *pNode ) { ActorFrame::LoadFromNode( sDir, pNode ); -#define GET_VALUE( szName, valueOut ) \ - if( !pNode->GetAttrValue( szName, valueOut ) ) { \ - RString sError = ssprintf("ActorScroller in '%s' is missing the value Scroller::%s", sDir.c_str(), szName); \ - LOG->Warn( sError ); \ - Dialog::OK( sError ); \ - } + Load2(); float fNumItemsToDraw = 0; - GET_VALUE( "NumItemsToDraw", fNumItemsToDraw ); - -#undef GET_VALUE - - SetNumItemsToDraw( fNumItemsToDraw ); - Load2(); + if( pNode->GetAttrValue("NumItemsToDraw", fNumItemsToDraw) ) + SetNumItemsToDraw( fNumItemsToDraw ); float fSecondsPerItem = 0; if( pNode->GetAttrValue("SecondsPerItem", fSecondsPerItem) )