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

LoadFromNode -> LoadActorFromNode. This isn't a normal

Browse Source 
LoadFromNode, which just loads state for an existing object.

pass parent
This commit is contained in:
Glenn Maynard
2006-10-14 04:44:15 +00:00
parent cfed5e52bb
commit b3b435ae5b
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/AutoActor.cpp
+2 -2
View File
@@ -43,11 +43,11 @@ void AutoActor::Load( const RString &sPath )
m_pActor = new Actor; m_pActor = new Actor;
} }
void AutoActor::LoadFromNode( const XNode* pNode ) void AutoActor::LoadActorFromNode( const XNode* pNode, Actor *pParent )
{ {
Unload(); Unload();
m_pActor = ActorUtil::LoadFromNode( pNode ); m_pActor = ActorUtil::LoadFromNode( pNode, pParent );
} }
void AutoActor::LoadAndSetName( const RString &sScreenName, const RString &sActorName ) void AutoActor::LoadAndSetName( const RString &sScreenName, const RString &sActorName )
stepmania/src/AutoActor.h
+1 -1
View File
@@ -23,7 +23,7 @@ public:
bool IsLoaded() const { return m_pActor != NULL; } bool IsLoaded() const { return m_pActor != NULL; }
void Load( Actor *pActor ); void Load( Actor *pActor );
void Load( const RString &sPath ); void Load( const RString &sPath );
void LoadFromNode( const XNode* pNode ); void LoadActorFromNode( const XNode *pNode, Actor *pParent );
void LoadAndSetName( const RString &sScreenName, const RString &sActorName ); void LoadAndSetName( const RString &sScreenName, const RString &sActorName );
protected: protected:
stepmania/src/DifficultyList.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ void DifficultyList::LoadFromNode( const XNode* pNode )
const XNode *pChild = pNode->GetChild( ssprintf("CursorP%i",pn+1) ); const XNode *pChild = pNode->GetChild( ssprintf("CursorP%i",pn+1) );
if( pChild == NULL ) if( pChild == NULL )
RageException::Throw( "%s: ComboGraph: missing the node \"CursorP%d\"", ActorUtil::GetWhere(pNode).c_str(), pn+1 ); RageException::Throw( "%s: ComboGraph: missing the node \"CursorP%d\"", ActorUtil::GetWhere(pNode).c_str(), pn+1 );
m_Cursors[pn].LoadFromNode( pChild ); m_Cursors[pn].LoadActorFromNode( pChild, this );
/* Hack: we need to tween cursors both up to down (cursor motion) and visible to /* Hack: we need to tween cursors both up to down (cursor motion) and visible to
* invisible (fading). Cursor motion needs to stoptweening, so multiple motions * invisible (fading). Cursor motion needs to stoptweening, so multiple motions
stepmania/src/GraphDisplay.cpp
+3 -3
View File
@@ -164,7 +164,7 @@ void GraphDisplay::LoadFromNode( const XNode* pNode )
pChild = pNode->GetChild( "Texture" ); pChild = pNode->GetChild( "Texture" );
if( pChild == NULL ) if( pChild == NULL )
RageException::Throw( "%s: ComboGraph: missing the node \"Texture\"", ActorUtil::GetWhere(pNode).c_str() ); RageException::Throw( "%s: ComboGraph: missing the node \"Texture\"", ActorUtil::GetWhere(pNode).c_str() );
m_sprTexture.LoadFromNode( pChild ); m_sprTexture.LoadActorFromNode( pChild, this );
m_size.x = m_sprTexture->GetUnzoomedWidth(); m_size.x = m_sprTexture->GetUnzoomedWidth();
m_size.y = m_sprTexture->GetUnzoomedHeight(); m_size.y = m_sprTexture->GetUnzoomedHeight();
this->AddChild( m_sprTexture ); this->AddChild( m_sprTexture );
@@ -178,12 +178,12 @@ void GraphDisplay::LoadFromNode( const XNode* pNode )
pChild = pNode->GetChild( "SongBoundary" ); pChild = pNode->GetChild( "SongBoundary" );
if( pChild == NULL ) if( pChild == NULL )
RageException::Throw( "%s: ComboGraph: missing the node \"SongBoundary\"", ActorUtil::GetWhere(pNode).c_str() ); RageException::Throw( "%s: ComboGraph: missing the node \"SongBoundary\"", ActorUtil::GetWhere(pNode).c_str() );
m_sprSongBoundary.LoadFromNode( pChild ); m_sprSongBoundary.LoadActorFromNode( pChild, this );
pChild = pNode->GetChild( "Barely" ); pChild = pNode->GetChild( "Barely" );
if( pChild == NULL ) if( pChild == NULL )
RageException::Throw( "%s: ComboGraph: missing the node \"Barely\"", ActorUtil::GetWhere(pNode).c_str() ); RageException::Throw( "%s: ComboGraph: missing the node \"Barely\"", ActorUtil::GetWhere(pNode).c_str() );
m_sprJustBarely.LoadFromNode( pChild ); m_sprJustBarely.LoadActorFromNode( pChild, this );
} }
void GraphDisplay::LoadFromStageStats( const StageStats &ss, const PlayerStageStats &pss ) void GraphDisplay::LoadFromStageStats( const StageStats &ss, const PlayerStageStats &pss )
stepmania/src/MeterDisplay.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ void MeterDisplay::LoadFromNode( const XNode* pNode )
const XNode* pChild = pNode->GetChild( "Tip" ); const XNode* pChild = pNode->GetChild( "Tip" );
if( pChild != NULL ) if( pChild != NULL )
{ {
m_sprTip.LoadFromNode( pChild ); m_sprTip.LoadActorFromNode( pChild, this );
this->AddChild( m_sprTip ); this->AddChild( m_sprTip );
} }