From a1d9d49d6cdd6c3cc6289c647596ba274bfa25a7 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 26 Sep 2005 19:35:15 +0000
Subject: [PATCH] simplify: an ActorScroller is always an ActorScroller

---
 stepmania/src/ActorScroller.cpp | 11 -----------
 stepmania/src/ActorScroller.h   |  1 -
 2 files changed, 12 deletions(-)

diff --git a/stepmania/src/ActorScroller.cpp b/stepmania/src/ActorScroller.cpp
index 6689d9d98b..16acb87719 100644
--- a/stepmania/src/ActorScroller.cpp
+++ b/stepmania/src/ActorScroller.cpp
@@ -21,7 +21,6 @@ Actor *ActorScroller::Copy() const { return new ActorScroller(*this); }
 
 ActorScroller::ActorScroller()
 {
-	m_bLoaded = false;
 	m_fCurrentItem = 0;
 	m_fDestinationItem = 0;
 	m_fSecondsPerItem = 1;
@@ -70,8 +69,6 @@ void ActorScroller::Load2(
 	m_quadMask.SetWidth( fItemWidth );
 	m_quadMask.SetHeight( fItemHeight );
 	m_quadMask.SetHidden( false );
-
-	m_bLoaded = true;
 }
 
 void ActorScroller::Load3(
@@ -91,7 +88,6 @@ void ActorScroller::Load3(
 	m_fQuantizePixels = 0;
 	m_quadMask.SetHidden( !bUseMask );
 	m_bLoop = bLoop;
-	m_bLoaded = true;
 }
 
 void ActorScroller::ScrollThroughAllItems()
@@ -209,13 +205,6 @@ void ActorScroller::PositionItems()
 
 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() )
 		return;
 
diff --git a/stepmania/src/ActorScroller.h b/stepmania/src/ActorScroller.h
index 37e371ac38..948c598063 100644
--- a/stepmania/src/ActorScroller.h
+++ b/stepmania/src/ActorScroller.h
@@ -55,7 +55,6 @@ protected:
 	void PositionItemsAndDrawPrimitives( bool bDrawPrimitives );
 
 private:
-	bool	m_bLoaded;
 	float	m_fCurrentItem; // Item at center of list, usually between 0 and m_SubActors.size(), approaches destination
 	float	m_fDestinationItem;
 	float	m_fSecondsPerItem;		// <= 0 means don't scroll