Always call LoadAllCommands explicitly.

The hack to LoadAllCommands when playing a command was leading to weird interactions: If a theme element contained an OnCommand, it would cause the rest of the commands defined in metrics to not be loaded.
This commit is contained in:
Chris Danford
2007-02-19 09:30:07 +00:00
parent d72ebfa33e
commit 599db61b62
42 changed files with 236 additions and 236 deletions
+3 -3
View File
@@ -746,18 +746,18 @@ void ScreenEdit::Init()
m_textInputTips.SetName( "EditHelp" );
m_textInputTips.LoadFromFont( THEME->GetPathF("ScreenEdit","EditHelp") );
m_textInputTips.SetText( EDIT_HELP_TEXT );
SET_XY_AND_ON_COMMAND( m_textInputTips );
LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND( m_textInputTips );
this->AddChild( &m_textInputTips );
m_textInfo.SetName( "Info" );
m_textInfo.LoadFromFont( THEME->GetPathF("ScreenEdit","Info") );
SET_XY_AND_ON_COMMAND( m_textInfo );
LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND( m_textInfo );
this->AddChild( &m_textInfo );
m_textPlayRecordHelp.SetName( "PlayRecordHelp" );
m_textPlayRecordHelp.LoadFromFont( THEME->GetPathF("ScreenEdit","PlayRecordHelp") );
m_textPlayRecordHelp.SetText( PLAY_RECORD_HELP_TEXT );
SET_XY_AND_ON_COMMAND( m_textPlayRecordHelp );
LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND( m_textPlayRecordHelp );
this->AddChild( &m_textPlayRecordHelp );
m_soundAddNote.Load( THEME->GetPathS("ScreenEdit","AddNote"), true );