From 6d14988b8a21051a13e1c6b7a57dd9c9e7885d22 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Tue, 15 Feb 2005 20:51:03 +0000
Subject: [PATCH] only override type if it wasn't specified

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

diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp
index 08aaa999a5..11a6c1a55e 100644
--- a/stepmania/src/ActorUtil.cpp
+++ b/stepmania/src/ActorUtil.cpp
@@ -64,7 +64,7 @@ Actor* ActorUtil::LoadFromActorFile( const CString& sAniDir, const XNode* pNode
 	// Element name is the type in XML.
 	// Type= is the name in INI.
 	CString sType = pNode->m_sName;
-	pNode->GetAttrValue( "Type", sType );
+	bool bHasType = pNode->GetAttrValue( "Type", sType );
 
 	CString sFile;
 	pNode->GetAttrValue( "File", sFile );
@@ -73,8 +73,10 @@ Actor* ActorUtil::LoadFromActorFile( const CString& sAniDir, const XNode* pNode
 	CString sText;
 	bool bHasText = pNode->GetAttrValue( "Text", sText );
 
+	//
 	// backward compatibility hacks
-	if( bHasText )
+	//
+	if( bHasText && !bHasType )
 		sType = "BitmapText";
 	else if( sFile.CompareNoCase("songbackground") == 0 )
 		sType = "SongBackground";