actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Sprite -> AutoActor

Browse Source
This commit is contained in:
Chris Danford
2005-03-29 01:33:20 +00:00
parent d27320e0e4
commit 2aab932973
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GhostArrow.cpp
+10 -10
View File
@@ -5,11 +5,6 @@
GhostArrow::GhostArrow() GhostArrow::GhostArrow()
{ {
FOREACH_TapNoteScore( i )
{
m_spr[i].SetHidden( true );
this->AddChild( &m_spr[i] );
}
} }
void GhostArrow::Load( CString sNoteSkin, CString sButton, CString sElement ) void GhostArrow::Load( CString sNoteSkin, CString sButton, CString sElement )
@@ -24,7 +19,12 @@ void GhostArrow::Load( CString sNoteSkin, CString sButton, CString sElement )
CString sPath = NOTESKIN->GetPathToFromNoteSkinAndButton(sNoteSkin, sButton, sFullElement, true); // optional CString sPath = NOTESKIN->GetPathToFromNoteSkinAndButton(sNoteSkin, sButton, sFullElement, true); // optional
if( sPath.empty() ) if( sPath.empty() )
sPath = NOTESKIN->GetPathToFromNoteSkinAndButton(sNoteSkin, sButton, sElement); // not optional sPath = NOTESKIN->GetPathToFromNoteSkinAndButton(sNoteSkin, sButton, sElement); // not optional
ASSERT( !m_spr[i].IsLoaded() ); // don't double-load
m_spr[i].Load( sPath ); m_spr[i].Load( sPath );
m_spr[i]->SetHidden( true );
this->AddChild( m_spr[i] );
} }
FOREACH_TapNoteScore( i ) FOREACH_TapNoteScore( i )
@@ -43,13 +43,13 @@ void GhostArrow::Step( TapNoteScore score )
// HACK: never hide the mine explosion // HACK: never hide the mine explosion
if( i == TNS_HIT_MINE ) if( i == TNS_HIT_MINE )
continue; continue;
m_spr[i].StopTweening(); m_spr[i]->StopTweening();
m_spr[i].SetHidden( true ); m_spr[i]->SetHidden( true );
} }
m_spr[score].SetHidden( false ); m_spr[score]->SetHidden( false );
m_spr[score].StopTweening(); m_spr[score]->StopTweening();
m_spr[score].RunCommands( m_acScoreCommand[score] ); m_spr[score]->RunCommands( m_acScoreCommand[score] );
} }
/* /*
stepmania/src/GhostArrow.h
+2 -2
View File
@@ -3,7 +3,7 @@
#ifndef GHOSTARROW_H #ifndef GHOSTARROW_H
#define GHOSTARROW_H #define GHOSTARROW_H
#include "Sprite.h" #include "AutoActor.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "PlayerNumber.h" #include "PlayerNumber.h"
#include "ActorFrame.h" #include "ActorFrame.h"
@@ -19,7 +19,7 @@ public:
void Step( TapNoteScore score ); void Step( TapNoteScore score );
protected: protected:
Sprite m_spr[NUM_TAP_NOTE_SCORES]; AutoActor m_spr[NUM_TAP_NOTE_SCORES];
apActorCommands m_acScoreCommand[NUM_TAP_NOTE_SCORES]; apActorCommands m_acScoreCommand[NUM_TAP_NOTE_SCORES];
}; };