fix up HelpDisplay in xml
This commit is contained in:
@@ -27,11 +27,8 @@ void HelpDisplay::Load( const RString &sType )
|
|||||||
void HelpDisplay::LoadFromNode( const RString& sDir, const XNode* pNode )
|
void HelpDisplay::LoadFromNode( const RString& sDir, const XNode* pNode )
|
||||||
{
|
{
|
||||||
BitmapText::LoadFromNode( sDir, pNode );
|
BitmapText::LoadFromNode( sDir, pNode );
|
||||||
}
|
|
||||||
|
|
||||||
void HelpDisplay::SetName( const RString &sName )
|
Load( m_sName );
|
||||||
{
|
|
||||||
BitmapText::SetName( sName );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void HelpDisplay::SetTips( const vector<RString> &arrayTips, const vector<RString> &arrayTipsAlt )
|
void HelpDisplay::SetTips( const vector<RString> &arrayTips, const vector<RString> &arrayTipsAlt )
|
||||||
@@ -141,7 +138,7 @@ REGISTER_ACTOR_CLASS( GenreDisplay )
|
|||||||
GenreDisplay::GenreDisplay()
|
GenreDisplay::GenreDisplay()
|
||||||
{
|
{
|
||||||
this->SubscribeToMessage( Message_CurrentSongChanged );
|
this->SubscribeToMessage( Message_CurrentSongChanged );
|
||||||
this->SubscribeToMessage( Message_CurrentCourseChanged);
|
this->SubscribeToMessage( Message_CurrentCourseChanged );
|
||||||
}
|
}
|
||||||
|
|
||||||
GenreDisplay::~GenreDisplay()
|
GenreDisplay::~GenreDisplay()
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ public:
|
|||||||
void GetTips( vector<RString> &arrayTipsOut, vector<RString> &arrayTipsAltOut ) const { arrayTipsOut = m_arrayTips; arrayTipsAltOut = m_arrayTipsAlt; }
|
void GetTips( vector<RString> &arrayTipsOut, vector<RString> &arrayTipsAltOut ) const { arrayTipsOut = m_arrayTips; arrayTipsAltOut = m_arrayTipsAlt; }
|
||||||
|
|
||||||
virtual void Update( float fDeltaTime );
|
virtual void Update( float fDeltaTime );
|
||||||
virtual void SetName( const RString &sName );
|
|
||||||
|
|
||||||
// Lua
|
// Lua
|
||||||
virtual void PushSelf( lua_State *L );
|
virtual void PushSelf( lua_State *L );
|
||||||
|
|||||||
Reference in New Issue
Block a user