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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-11-02 06:47:48 +00:00
parent 083c20497c
commit f4136c72e6
2 changed files with 18 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteDisplay.cpp
+12 -34
View File
@@ -154,25 +154,8 @@ static NoteResource *MakeNoteResource( const RString &sButton, const RString &sE
return pRet;
}
static NoteResource *FindNoteResource( const Actor *pActor )
static void DeleteNoteResource( NoteResource *pRes )
{
map<NoteSkinAndPath, NoteResource *>::iterator it;
for( it = g_NoteResource.begin(); it != g_NoteResource.end(); ++it )
{
NoteResource *pRes = it->second;
if( pRes->m_pActor == pActor )
return pRes;
}
return NULL;
}
static void DeleteNoteResource( const Actor *pActor )
{
if( pActor == NULL )
return;
NoteResource *pRes = FindNoteResource( pActor );
ASSERT( pRes != NULL );
ASSERT_M( pRes->m_iRefCount > 0, ssprintf("%i", pRes->m_iRefCount) );
@@ -184,20 +167,6 @@ static void DeleteNoteResource( const Actor *pActor )
delete pRes;
}
Actor *MakeRefcountedActor( const RString &sButton, const RString &sElement )
{
NoteResource *pRes = MakeNoteResource( sButton, sElement, false );
return pRes->m_pActor;
}
Sprite *MakeRefcountedSprite( const RString &sButton, const RString &sElement )
{
NoteResource *pRes = MakeNoteResource( sButton, sElement, true );
Sprite *pSprite = dynamic_cast<Sprite *>( pRes->m_pActor );
ASSERT( pSprite != NULL );
return pSprite;
}
NoteColorActor::NoteColorActor()
{
m_p = NULL;
@@ -211,10 +180,15 @@ NoteColorActor::~NoteColorActor()
void NoteColorActor::Load( const RString &sButton, const RString &sElement )
{
m_p = MakeRefcountedActor( sButton, sElement );
m_p = MakeNoteResource( sButton, sElement, false );
}
Actor *NoteColorActor::Get()
{
return m_p->m_pActor;
}
NoteColorSprite::NoteColorSprite()
{
m_p = NULL;
@@ -228,9 +202,13 @@ NoteColorSprite::~NoteColorSprite()
void NoteColorSprite::Load( const RString &sButton, const RString &sElement )
{
m_p = MakeRefcountedSprite( sButton, sElement );
m_p = MakeNoteResource( sButton, sElement, true );
}
Sprite *NoteColorSprite::Get()
{
return dynamic_cast<Sprite *>( m_p->m_pActor );
}
static const char *HoldTypeNames[] = {
"hold",
stepmania/src/NoteDisplay.h
+6 -4
View File
@@ -25,14 +25,16 @@ enum NotePart
NUM_NotePart
};
struct NoteResource;
struct NoteColorActor
{
NoteColorActor();
~NoteColorActor();
void Load( const RString &sButton, const RString &sElement );
Actor *Get() { return m_p; }
Actor *Get();
private:
Actor *m_p;
NoteResource *m_p;
};
struct NoteColorSprite
@@ -40,9 +42,9 @@ struct NoteColorSprite
NoteColorSprite();
~NoteColorSprite();
void Load( const RString &sButton, const RString &sElement );
Sprite *Get() { return m_p; }
Sprite *Get();
private:
Sprite *m_p;
NoteResource *m_p;
};
enum HoldType