actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OptionRow::Reload doesn't take an OptionRowDefinition.

Browse Source 
Implement Reload() explicitly, so we can clearly short-
circuit for static rows.

Fix up ScreenOptionsEditCourseEntry (broken during the
course of things).
This commit is contained in:
Glenn Maynard
2006-01-18 01:34:45 +00:00
parent 9b37d8966c
commit a3dc5596de
5 changed files with 124 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRow.cpp
+4 -6
View File
@@ -877,7 +877,7 @@ void OptionRow::SetExitText( CString sExitText )
bt->SetText( sExitText );
}
void OptionRow::Reload( const OptionRowDefinition &def )
void OptionRow::Reload()
{
switch( GetRowType() )
{
@@ -895,10 +895,8 @@ void OptionRow::Reload( const OptionRowDefinition &def )
// ExportOptions( vpns, bRowHasFocus );
//}
if( m_pHand == NULL )
m_pHand->m_Def = def;
else
m_pHand->Reload();
if( !m_pHand->Reload() )
break;
m_pHand->m_Def = m_pHand->m_Def;
ASSERT( !m_pHand->m_Def.m_vsChoices.empty() );
@@ -953,7 +951,7 @@ void OptionRow::Reload( const OptionRowDefinition &def )
void OptionRow::HandleMessage( const CString& sMessage )
{
Reload( m_pHand->m_Def );
Reload();
}