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

cleanup more

Browse Source
This commit is contained in:
Glenn Maynard
2006-10-11 04:58:11 +00:00
parent 0b87622780
commit 2201d813b2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorUtil.cpp
+3 -3
View File
@@ -297,11 +297,11 @@ static void MergeActorXML( XNode *pChild, const XNode *pParent )
if( pChild->GetAttr(p->first) != NULL ) if( pChild->GetAttr(p->first) != NULL )
{ {
RString sWarning = RString sWarning =
ssprintf( "%s: \"%s\" overrides \"%s\" in %s", ssprintf( "%s: overriding \"%s\" in %s node \"%s\"",
ActorUtil::GetWhere(pParent).c_str(), ActorUtil::GetWhere(pParent).c_str(),
sName.c_str(), sName.c_str(),
p->second->GetValue<RString>().c_str(), ActorUtil::GetWhere(pChild).c_str(),
ActorUtil::GetWhere(pChild).c_str() ); pParent->GetName().c_str() );
Dialog::OK( sWarning, "XML_ATTRIB_OVERRIDE" ); Dialog::OK( sWarning, "XML_ATTRIB_OVERRIDE" );
} }
pChild->AppendAttrFrom( p->first, p->second->Copy() ); pChild->AppendAttrFrom( p->first, p->second->Copy() );