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

remove unused parameter; simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-17 20:36:29 +00:00
parent 367d5f8f41
commit 85d654a306
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRowHandler.cpp
+2 -2
View File
@@ -1183,13 +1183,13 @@ public:
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
OptionRowHandler* OptionRowHandlerUtil::Make( const Commands &cmds, OptionRowDefinition &defOut ) OptionRowHandler* OptionRowHandlerUtil::Make( const Commands &cmds )
{ {
OptionRowHandler* pHand = NULL; OptionRowHandler* pHand = NULL;
const CString &name = cmds.v[0].GetName(); const CString &name = cmds.v[0].GetName();
#define MAKE( type ) { type *p = new type; p->Load( defOut, cmds ); pHand = p; } #define MAKE( type ) { type *p = new type; p->Load( cmds ); pHand = p; }
if( name == "list" ) MAKE( OptionRowHandlerList ) if( name == "list" ) MAKE( OptionRowHandlerList )
else if( name == "lua" ) MAKE( OptionRowHandlerLua ) else if( name == "lua" ) MAKE( OptionRowHandlerLua )
stepmania/src/OptionRowHandler.h
+3 -4
View File
@@ -24,15 +24,14 @@ public:
m_cmds.v.clear(); m_cmds.v.clear();
m_vsReloadRowMessages.clear(); m_vsReloadRowMessages.clear();
} }
void Load( OptionRowDefinition &defOut, const Commands &cmds ) void Load( const Commands &cmds )
{ {
Init(); Init();
m_cmds = cmds; m_cmds = cmds;
this->LoadInternal( m_Def, cmds ); this->LoadInternal( m_Def, cmds );
defOut = m_Def;
} }
virtual void LoadInternal( OptionRowDefinition &defOut, const Commands &cmds ) = 0; virtual void LoadInternal( OptionRowDefinition &defOut, const Commands &cmds ) = 0;
virtual void Reload( OptionRowDefinition &defOut ) { this->Load(defOut,m_cmds); } virtual void Reload( OptionRowDefinition &defOut ) { this->Load(m_cmds); defOut = m_Def; }
virtual void ImportOption( const OptionRowDefinition &row, const vector<PlayerNumber> &vpns, vector<bool> vbSelectedOut[NUM_PLAYERS] ) const = 0; virtual void ImportOption( const OptionRowDefinition &row, const vector<PlayerNumber> &vpns, vector<bool> vbSelectedOut[NUM_PLAYERS] ) const = 0;
/* Returns an OPT mask. */ /* Returns an OPT mask. */
virtual int ExportOption( const OptionRowDefinition &def, const vector<PlayerNumber> &vpns, const vector<bool> vbSelected[NUM_PLAYERS] ) const = 0; virtual int ExportOption( const OptionRowDefinition &def, const vector<PlayerNumber> &vpns, const vector<bool> vbSelected[NUM_PLAYERS] ) const = 0;
@@ -43,7 +42,7 @@ public:
namespace OptionRowHandlerUtil namespace OptionRowHandlerUtil
{ {
OptionRowHandler* Make( const Commands &cmds, OptionRowDefinition &defOut ); OptionRowHandler* Make( const Commands &cmds );
} }
inline void VerifySelected( SelectType st, const vector<bool> &vbSelected, const CString &sName ) inline void VerifySelected( SelectType st, const vector<bool> &vbSelected, const CString &sName )
stepmania/src/ScreenOptionsManageProfiles.cpp
+2 -4
View File
@@ -102,8 +102,7 @@ void ScreenOptionsManageProfiles::BeginScreen()
if( SHOW_CREATE_NEW ) if( SHOW_CREATE_NEW )
{ {
OptionRowDefinition def; OptionRowHandler *pHand = OptionRowHandlerUtil::Make( ParseCommands("gamecommand;screen,ScreenOptionsEditProfile;name,Create New") );
OptionRowHandler *pHand = OptionRowHandlerUtil::Make( ParseCommands("gamecommand;screen,ScreenOptionsEditProfile;name,Create New"), def );
pHand->m_Def.m_layoutType = LAYOUT_SHOW_ALL_IN_ROW; pHand->m_Def.m_layoutType = LAYOUT_SHOW_ALL_IN_ROW;
pHand->m_Def.m_bAllowThemeTitle = false; pHand->m_Def.m_bAllowThemeTitle = false;
pHand->m_Def.m_bAllowThemeItems = false; pHand->m_Def.m_bAllowThemeItems = false;
@@ -121,9 +120,8 @@ void ScreenOptionsManageProfiles::BeginScreen()
Profile *pProfile = PROFILEMAN->GetLocalProfile( *s ); Profile *pProfile = PROFILEMAN->GetLocalProfile( *s );
ASSERT( pProfile ); ASSERT( pProfile );
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) );
pHand->m_Def.m_layoutType = LAYOUT_SHOW_ALL_IN_ROW; pHand->m_Def.m_layoutType = LAYOUT_SHOW_ALL_IN_ROW;
pHand->m_Def.m_bAllowThemeTitle = false; pHand->m_Def.m_bAllowThemeTitle = false;
pHand->m_Def.m_bAllowThemeItems = false; pHand->m_Def.m_bAllowThemeItems = false;
stepmania/src/ScreenOptionsMaster.cpp
+1 -2
View File
@@ -59,8 +59,7 @@ void ScreenOptionsMaster::Init()
Commands cmds; Commands cmds;
ParseCommands( sRowCommands, cmds ); ParseCommands( sRowCommands, cmds );
OptionRowDefinition def; OptionRowHandler *pHand = OptionRowHandlerUtil::Make( cmds );
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 );