From 34e34cad980d7edfce646c633125559616159cba Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 12 Oct 2005 05:15:03 +0000
Subject: [PATCH] remove m_HoldGhost; implement in "tap explosion"

---
 stepmania/src/GhostArrowRow.cpp | 19 -------------------
 stepmania/src/GhostArrowRow.h   |  2 --
 2 files changed, 21 deletions(-)

diff --git a/stepmania/src/GhostArrowRow.cpp b/stepmania/src/GhostArrowRow.cpp
index a6e37e47c9..5b4375af99 100644
--- a/stepmania/src/GhostArrowRow.cpp
+++ b/stepmania/src/GhostArrowRow.cpp
@@ -28,10 +28,6 @@ void GhostArrowRow::Load( const PlayerState* pPlayerState, float fYReverseOffset
 	{
 		const CString &sButton = GAMESTATE->GetCurrentGame()->ColToButtonName( c );
 
-		m_HoldGhost.push_back( new HoldGhostArrow );
-		m_HoldGhost[c]->SetName( "HoldGhostArrow" );
-		m_HoldGhost[c]->Load( sButton, "hold explosion" );
-		
 		m_bHoldIsActive.push_back( false );
 		m_bHoldWasActive.push_back( false );
 
@@ -43,10 +39,7 @@ void GhostArrowRow::Load( const PlayerState* pPlayerState, float fYReverseOffset
 GhostArrowRow::~GhostArrowRow()
 {
 	for( unsigned i = 0; i < m_Ghost.size(); ++i )
-	{
 		delete m_Ghost[i];
-		delete m_HoldGhost[i];
-	}
 }
 
 
@@ -55,24 +48,17 @@ void GhostArrowRow::Update( float fDeltaTime )
 	for( unsigned c=0; c<m_Ghost.size(); c++ )
 	{
 		m_Ghost[c]->Update( fDeltaTime );
-		m_HoldGhost[c]->Update( fDeltaTime );
 
 		const float fX = ArrowEffects::GetXPos( m_pPlayerState, c, 0 );
 		const float fY = ArrowEffects::GetYPos( m_pPlayerState, c, 0, m_fYReverseOffsetPixels );
 		const float fZ = ArrowEffects::GetZPos( m_pPlayerState, c, 0 );
 
 		m_Ghost[c]->SetX( fX );
-		m_HoldGhost[c]->SetX( fX );
-
 		m_Ghost[c]->SetY( fY );
-		m_HoldGhost[c]->SetY( fY );
-
 		m_Ghost[c]->SetZ( fZ );
-		m_HoldGhost[c]->SetZ( fZ );
 
 		const float fZoom = ArrowEffects::GetZoom( m_pPlayerState );
 		m_Ghost[c]->SetZoom( fZoom );
-		m_HoldGhost[c]->SetZoom( fZoom );
 	}
 
 	for( unsigned i = 0; i < m_bHoldIsActive.size(); ++i )
@@ -94,10 +80,7 @@ void GhostArrowRow::DrawPrimitives()
 		PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
 
 		NoteFieldMode::BeginDrawTrack( pn, c );
-
 		m_Ghost[c]->Draw();
-		m_HoldGhost[c]->Draw();
-
 		NoteFieldMode::EndDrawTrack( c );
 	}
 }
@@ -131,8 +114,6 @@ void GhostArrowRow::DidHoldNote( int iCol, HoldNoteScore hns, bool bBright )
 void GhostArrowRow::SetHoldIsActive( int iCol )
 {
 	ASSERT( iCol >= 0  &&  iCol < (int) m_Ghost.size() );
-
-	m_HoldGhost[iCol]->SetHoldIsActive( true );
 	m_bHoldIsActive[iCol] = true;
 }
 
diff --git a/stepmania/src/GhostArrowRow.h b/stepmania/src/GhostArrowRow.h
index 6deb352982..9a24bc440e 100644
--- a/stepmania/src/GhostArrowRow.h
+++ b/stepmania/src/GhostArrowRow.h
@@ -4,7 +4,6 @@
 #define GHOSTARROWROW_H
 
 #include "ActorFrame.h"
-#include "HoldGhostArrow.h"
 #include "GameConstantsAndTypes.h"
 
 class PlayerState;
@@ -28,7 +27,6 @@ protected:
 	const PlayerState* m_pPlayerState;
 
 	vector<Actor *> 	m_Ghost;
-	vector<HoldGhostArrow *> m_HoldGhost;
 	vector<bool> m_bHoldIsActive;
 	vector<bool> m_bHoldWasActive;
 };