remove m_HoldGhost; implement in "tap explosion"

This commit is contained in:
Glenn Maynard
2005-10-12 05:15:03 +00:00
parent 59570b25d1
commit 34e34cad98
2 changed files with 0 additions and 21 deletions
-19
View File
@@ -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;
}
-2
View File
@@ -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;
};