phase out param

2006-08-16 18:31:00 +00:00
parent 2877e7ef0f
commit 47a62d7db6
7 changed files with 16 additions and 8 deletions
@@ -41,7 +41,8 @@ ActorScroller::ActorScroller()

 void ActorScroller::Load2( float fNumItemsToDraw )
 {
-	m_fNumItemsToDraw = fNumItemsToDraw;
+	if( fNumItemsToDraw != -1 )
+		m_fNumItemsToDraw = fNumItemsToDraw;
 	m_iNumItems = m_SubActors.size();

 	Lua *L = LUA->Get();
@@ -121,7 +122,8 @@ void ActorScroller::LoadFromNode( const RString &sDir, const XNode *pNode )

 #undef GET_VALUE

-	Load2( fNumItemsToDraw );
+	SetNumItemsToDraw( fNumItemsToDraw );
+	Load2();

 	float fSecondsPerItem = 0;
 	if( pNode->GetAttrValue("SecondsPerItem", fSecondsPerItem) )