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

use pHand->m_Def

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-17 20:28:44 +00:00
parent fb98337d27
commit ded3feb51c
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsManageProfiles.cpp
+9 -3
View File
@@ -109,8 +109,11 @@ void ScreenOptionsManageProfiles::BeginScreen()
{ {
OptionRowDefinition def; OptionRowDefinition def;
OptionRowHandler *pHand = OptionRowHandlerUtil::Make( ParseCommands("gamecommand;screen,ScreenOptionsEditProfile;name,Create New"), def ); OptionRowHandler *pHand = OptionRowHandlerUtil::Make( ParseCommands("gamecommand;screen,ScreenOptionsEditProfile;name,Create New"), def );
vDefs.push_back( def ); pHand->m_Def.m_layoutType = LAYOUT_SHOW_ALL_IN_ROW;
pHand->m_Def.m_bAllowThemeTitle = false;
pHand->m_Def.m_bAllowThemeItems = false;
OptionRowHandlers.push_back( pHand ); OptionRowHandlers.push_back( pHand );
vDefs.push_back( pHand->m_Def );
// FIXME // FIXME
// gc.Load( iIndex++, ); // gc.Load( iIndex++, );
@@ -126,9 +129,12 @@ void ScreenOptionsManageProfiles::BeginScreen()
OptionRowDefinition def; OptionRowDefinition def;
CString sCommand = ssprintf( "gamecommand;screen,ScreenOptionsEditProfile;profileid,%s;name,%s", s->c_str(), pProfile->m_sDisplayName.c_str() ); CString sCommand = ssprintf( "gamecommand;screen,ScreenOptionsEditProfile;profileid,%s;name,%s", s->c_str(), pProfile->m_sDisplayName.c_str() );
OptionRowHandler *pHand = OptionRowHandlerUtil::Make( ParseCommands(sCommand), def ); OptionRowHandler *pHand = OptionRowHandlerUtil::Make( ParseCommands(sCommand), def );
def.m_sName = ssprintf( "%d", iIndex ); pHand->m_Def.m_layoutType = LAYOUT_SHOW_ALL_IN_ROW;
vDefs.push_back( def ); pHand->m_Def.m_bAllowThemeTitle = false;
pHand->m_Def.m_bAllowThemeItems = false;
pHand->m_Def.m_sName = ssprintf( "%d", iIndex );
OptionRowHandlers.push_back( pHand ); OptionRowHandlers.push_back( pHand );
vDefs.push_back( pHand->m_Def );
// FIXME // FIXME
// gc.Load( iIndex++, ); // gc.Load( iIndex++, );
stepmania/src/ScreenOptionsMaster.cpp
+2 -2
View File
@@ -50,7 +50,6 @@ void ScreenOptionsMaster::Init()
ScreenOptions::Init(); ScreenOptions::Init();
vector<OptionRowDefinition> OptionRowDefs; vector<OptionRowDefinition> OptionRowDefs;
OptionRowDefs.resize( asLineNames.size() );
vector<OptionRowHandler*> OptionRowHandlers; vector<OptionRowHandler*> OptionRowHandlers;
for( unsigned i = 0; i < asLineNames.size(); ++i ) for( unsigned i = 0; i < asLineNames.size(); ++i )
{ {
@@ -60,11 +59,12 @@ void ScreenOptionsMaster::Init()
Commands cmds; Commands cmds;
ParseCommands( sRowCommands, cmds ); ParseCommands( sRowCommands, cmds );
OptionRowDefinition &def = OptionRowDefs[i]; OptionRowDefinition def;
OptionRowHandler *pHand = OptionRowHandlerUtil::Make( cmds, def ); OptionRowHandler *pHand = OptionRowHandlerUtil::Make( cmds, def );
if( pHand == NULL ) if( pHand == NULL )
RageException::Throw( "Invalid OptionRowHandler '%s' in %s::Line%i", cmds.GetOriginalCommandString().c_str(), m_sName.c_str(), i ); RageException::Throw( "Invalid OptionRowHandler '%s' in %s::Line%i", cmds.GetOriginalCommandString().c_str(), m_sName.c_str(), i );
OptionRowHandlers.push_back( pHand ); OptionRowHandlers.push_back( pHand );
OptionRowDefs.push_back( pHand->m_Def );
} }
ASSERT( OptionRowHandlers.size() == asLineNames.size() ); ASSERT( OptionRowHandlers.size() == asLineNames.size() );