From 2201d813b249c73e6e5b8774221b2aeb4475c199 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 11 Oct 2006 04:58:11 +0000
Subject: [PATCH] cleanup more

---
 stepmania/src/ActorUtil.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp
index 125de1f849..b66f46132f 100644
--- a/stepmania/src/ActorUtil.cpp
+++ b/stepmania/src/ActorUtil.cpp
@@ -297,11 +297,11 @@ static void MergeActorXML( XNode *pChild, const XNode *pParent )
 		if( pChild->GetAttr(p->first) != NULL )
 		{
 			RString sWarning = 
-				ssprintf( "%s: \"%s\" overrides \"%s\" in %s",
+				ssprintf( "%s: overriding \"%s\" in %s node \"%s\"",
 				ActorUtil::GetWhere(pParent).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" );
 		}
 		pChild->AppendAttrFrom( p->first, p->second->Copy() );