simplify: an ActorScroller is always an ActorScroller

This commit is contained in:
Glenn Maynard
2005-09-26 19:35:15 +00:00
parent 45c50c854d
commit a1d9d49d6c
2 changed files with 0 additions and 12 deletions
-11
View File
@@ -21,7 +21,6 @@ Actor *ActorScroller::Copy() const { return new ActorScroller(*this); }
ActorScroller::ActorScroller() ActorScroller::ActorScroller()
{ {
m_bLoaded = false;
m_fCurrentItem = 0; m_fCurrentItem = 0;
m_fDestinationItem = 0; m_fDestinationItem = 0;
m_fSecondsPerItem = 1; m_fSecondsPerItem = 1;
@@ -70,8 +69,6 @@ void ActorScroller::Load2(
m_quadMask.SetWidth( fItemWidth ); m_quadMask.SetWidth( fItemWidth );
m_quadMask.SetHeight( fItemHeight ); m_quadMask.SetHeight( fItemHeight );
m_quadMask.SetHidden( false ); m_quadMask.SetHidden( false );
m_bLoaded = true;
} }
void ActorScroller::Load3( void ActorScroller::Load3(
@@ -91,7 +88,6 @@ void ActorScroller::Load3(
m_fQuantizePixels = 0; m_fQuantizePixels = 0;
m_quadMask.SetHidden( !bUseMask ); m_quadMask.SetHidden( !bUseMask );
m_bLoop = bLoop; m_bLoop = bLoop;
m_bLoaded = true;
} }
void ActorScroller::ScrollThroughAllItems() void ActorScroller::ScrollThroughAllItems()
@@ -209,13 +205,6 @@ void ActorScroller::PositionItems()
void ActorScroller::PositionItemsAndDrawPrimitives( bool bDrawPrimitives ) void ActorScroller::PositionItemsAndDrawPrimitives( bool bDrawPrimitives )
{ {
// Optimization: If we weren't loaded, then fall back to the ActorFrame logic
if( !m_bLoaded )
{
ActorFrame::DrawPrimitives();
return;
}
if( m_SubActors.empty() ) if( m_SubActors.empty() )
return; return;
-1
View File
@@ -55,7 +55,6 @@ protected:
void PositionItemsAndDrawPrimitives( bool bDrawPrimitives ); void PositionItemsAndDrawPrimitives( bool bDrawPrimitives );
private: private:
bool m_bLoaded;
float m_fCurrentItem; // Item at center of list, usually between 0 and m_SubActors.size(), approaches destination float m_fCurrentItem; // Item at center of list, usually between 0 and m_SubActors.size(), approaches destination
float m_fDestinationItem; float m_fDestinationItem;
float m_fSecondsPerItem; // <= 0 means don't scroll float m_fSecondsPerItem; // <= 0 means don't scroll