From 6996b06df78003fb4705fba1552d06af214df94e Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 16 Aug 2006 05:26:49 +0000
Subject: [PATCH] fix up HelpDisplay in xml

---
 stepmania/src/HelpDisplay.cpp | 7 ++-----
 stepmania/src/HelpDisplay.h   | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/stepmania/src/HelpDisplay.cpp b/stepmania/src/HelpDisplay.cpp
index 64efa800cb..17c1d3b9be 100644
--- a/stepmania/src/HelpDisplay.cpp
+++ b/stepmania/src/HelpDisplay.cpp
@@ -27,11 +27,8 @@ void HelpDisplay::Load( const RString &sType )
 void HelpDisplay::LoadFromNode( const RString& sDir, const XNode* pNode )
 {
 	BitmapText::LoadFromNode( sDir, pNode );
-}
 
-void HelpDisplay::SetName( const RString &sName )
-{
-	BitmapText::SetName( sName );
+	Load( m_sName );
 }
 
 void HelpDisplay::SetTips( const vector<RString> &arrayTips, const vector<RString> &arrayTipsAlt )
@@ -141,7 +138,7 @@ REGISTER_ACTOR_CLASS( GenreDisplay )
 GenreDisplay::GenreDisplay()
 {
 	this->SubscribeToMessage( Message_CurrentSongChanged );
-	this->SubscribeToMessage( Message_CurrentCourseChanged);
+	this->SubscribeToMessage( Message_CurrentCourseChanged );
 }
 
 GenreDisplay::~GenreDisplay()
diff --git a/stepmania/src/HelpDisplay.h b/stepmania/src/HelpDisplay.h
index add3af5fe9..a2f483eec9 100644
--- a/stepmania/src/HelpDisplay.h
+++ b/stepmania/src/HelpDisplay.h
@@ -23,7 +23,6 @@ public:
 	void GetTips( vector<RString> &arrayTipsOut, vector<RString> &arrayTipsAltOut ) const { arrayTipsOut = m_arrayTips; arrayTipsAltOut = m_arrayTipsAlt; }
 
 	virtual void Update( float fDeltaTime );
-	virtual void SetName( const RString &sName );
 
 	// Lua
 	virtual void PushSelf( lua_State *L );