diff --git a/stepmania/src/AutoActor.cpp b/stepmania/src/AutoActor.cpp index c1216168f4..dbf809c282 100644 --- a/stepmania/src/AutoActor.cpp +++ b/stepmania/src/AutoActor.cpp @@ -43,11 +43,11 @@ void AutoActor::Load( const RString &sPath ) m_pActor = new Actor; } -void AutoActor::LoadFromNode( const XNode* pNode ) +void AutoActor::LoadActorFromNode( const XNode* pNode, Actor *pParent ) { Unload(); - m_pActor = ActorUtil::LoadFromNode( pNode ); + m_pActor = ActorUtil::LoadFromNode( pNode, pParent ); } void AutoActor::LoadAndSetName( const RString &sScreenName, const RString &sActorName ) diff --git a/stepmania/src/AutoActor.h b/stepmania/src/AutoActor.h index ba31aef590..4a5d0eb854 100644 --- a/stepmania/src/AutoActor.h +++ b/stepmania/src/AutoActor.h @@ -23,7 +23,7 @@ public: bool IsLoaded() const { return m_pActor != NULL; } void Load( Actor *pActor ); 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 ); protected: diff --git a/stepmania/src/DifficultyList.cpp b/stepmania/src/DifficultyList.cpp index 70c735ea2e..1d4c95b669 100644 --- a/stepmania/src/DifficultyList.cpp +++ b/stepmania/src/DifficultyList.cpp @@ -45,7 +45,7 @@ void DifficultyList::LoadFromNode( const XNode* pNode ) const XNode *pChild = pNode->GetChild( ssprintf("CursorP%i",pn+1) ); if( pChild == NULL ) 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 * invisible (fading). Cursor motion needs to stoptweening, so multiple motions diff --git a/stepmania/src/GraphDisplay.cpp b/stepmania/src/GraphDisplay.cpp index 5a90fdd782..38d1e04afc 100644 --- a/stepmania/src/GraphDisplay.cpp +++ b/stepmania/src/GraphDisplay.cpp @@ -164,7 +164,7 @@ void GraphDisplay::LoadFromNode( const XNode* pNode ) pChild = pNode->GetChild( "Texture" ); if( pChild == NULL ) 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.y = m_sprTexture->GetUnzoomedHeight(); this->AddChild( m_sprTexture ); @@ -178,12 +178,12 @@ void GraphDisplay::LoadFromNode( const XNode* pNode ) pChild = pNode->GetChild( "SongBoundary" ); if( pChild == NULL ) 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" ); if( pChild == NULL ) 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 ) diff --git a/stepmania/src/MeterDisplay.cpp b/stepmania/src/MeterDisplay.cpp index 8ac9aec8ed..0930c6a6a9 100644 --- a/stepmania/src/MeterDisplay.cpp +++ b/stepmania/src/MeterDisplay.cpp @@ -52,7 +52,7 @@ void MeterDisplay::LoadFromNode( const XNode* pNode ) const XNode* pChild = pNode->GetChild( "Tip" ); if( pChild != NULL ) { - m_sprTip.LoadFromNode( pChild ); + m_sprTip.LoadActorFromNode( pChild, this ); this->AddChild( m_sprTip ); }