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

cleanup, fix offset vbSelected values when using NextRow choice at the front

Browse Source
This commit is contained in:
Chris Danford
2005-02-24 06:10:11 +00:00
parent a9c73de5b6
commit ca3684b232
3 changed files with 164 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRowHandler.h
+2 -89
View File
@@ -26,102 +26,15 @@ public:
virtual void ImportOption( const OptionRowDefinition &row, PlayerNumber pn, vector<bool> &vbSelectedOut ) const = 0;
/* Returns an OPT mask. */
virtual int ExportOption( const OptionRowDefinition &def, PlayerNumber pn, const vector<bool> &vbSelected ) const = 0;
virtual void Reload( OptionRowDefinition &def ) {}
virtual void Reload( OptionRowDefinition &defOut ) {}
virtual CString GetIconText( const OptionRowDefinition &def, int iFirstSelection ) const { return ""; }
virtual CString GetAndEraseScreen( int iChoice ) { return ""; }
};
class OptionRowHandlerList : public OptionRowHandler
{
public:
vector<GameCommand> ListEntries;
GameCommand Default;
bool m_bUseModNameForIcon;
OptionRowHandlerList::OptionRowHandlerList() { Init(); }
virtual void Init()
{
OptionRowHandler::Init();
ListEntries.clear();
Default.Init();
m_bUseModNameForIcon = false;
}
virtual void ImportOption( const OptionRowDefinition &row, PlayerNumber pn, vector<bool> &vbSelectedOut ) const;
virtual int ExportOption( const OptionRowDefinition &def, PlayerNumber pn, const vector<bool> &vbSelected ) const;
virtual CString GetIconText( const OptionRowDefinition &def, int iFirstSelection ) const
{
return m_bUseModNameForIcon ?
ListEntries[iFirstSelection].m_sModifiers :
def.choices[iFirstSelection];
}
virtual CString GetAndEraseScreen( int iChoice )
{
GameCommand &mc = ListEntries[iChoice];
if( mc.m_sScreen != "" )
{
/* Hack: instead of applying screen commands here, store them in
* m_sNextScreen and apply them after we tween out. If we don't set
* m_sScreen to "", we'll load it twice (once for each player) and
* then again for m_sNextScreen. */
CString sNextScreen = mc.m_sScreen;
mc.m_sScreen = "";
return sNextScreen;
}
return "";
}
};
class OptionRowHandlerLua : public OptionRowHandler
{
public:
LuaExpression *m_pLuaTable;
OptionRowHandlerLua::OptionRowHandlerLua() { m_pLuaTable = NULL; Init(); }
void Init()
{
OptionRowHandler::Init();
delete m_pLuaTable;
m_pLuaTable = new LuaExpression;
}
virtual void ImportOption( const OptionRowDefinition &row, PlayerNumber pn, vector<bool> &vbSelectedOut ) const;
virtual int ExportOption( const OptionRowDefinition &def, PlayerNumber pn, const vector<bool> &vbSelected ) const;
virtual void Reload( OptionRowDefinition &def );
};
class OptionRowHandlerConfig : public OptionRowHandler
{
public:
const ConfOption *opt;
OptionRowHandlerConfig::OptionRowHandlerConfig() { Init(); }
void Init()
{
OptionRowHandler::Init();
opt = NULL;
}
virtual void ImportOption( const OptionRowDefinition &row, PlayerNumber pn, vector<bool> &vbSelectedOut ) const;
virtual int ExportOption( const OptionRowDefinition &def, PlayerNumber pn, const vector<bool> &vbSelected ) const;
};
namespace OptionRowHandlerUtil
{
void FillList( OptionRowHandlerList* pHand, OptionRowDefinition &def, CString param );
void FillLua( OptionRowHandlerLua* pHand, OptionRowDefinition &def, CString sLuaFunction );
void FillSteps( OptionRowHandlerList* pHand, OptionRowDefinition &def );
void FillConf( OptionRowHandlerConfig* pHand, OptionRowDefinition &def, CString param );
void FillCharacters( OptionRowHandlerList* pHand, OptionRowDefinition &def );
void FillStyles( OptionRowHandlerList* pHand, OptionRowDefinition &def );
void FillGroups( OptionRowHandlerList* pHand, OptionRowDefinition &def );
void FillDifficulties( OptionRowHandlerList* pHand, OptionRowDefinition &def );
inline OptionRowHandler* MakeList( OptionRowDefinition &def, CString param ) { OptionRowHandlerList *pHand = new OptionRowHandlerList; FillList( pHand, def, param ); return pHand; }
inline OptionRowHandler* MakeLua( OptionRowDefinition &def, CString sLuaFunction ) { OptionRowHandlerLua *pHand = new OptionRowHandlerLua; FillLua( pHand, def, sLuaFunction ); return pHand; }
inline OptionRowHandler* MakeSteps( OptionRowDefinition &def ) { OptionRowHandlerList *pHand = new OptionRowHandlerList; FillSteps( pHand, def ); return pHand; }
inline OptionRowHandler* MakeConf( OptionRowDefinition &def, CString param ) { OptionRowHandlerConfig *pHand = new OptionRowHandlerConfig; FillConf( pHand, def, param ); return pHand; }
inline OptionRowHandler* MakeCharacters( OptionRowDefinition &def ) { OptionRowHandlerList *pHand = new OptionRowHandlerList; FillCharacters( pHand, def ); return pHand; }
inline OptionRowHandler* MakeStyles( OptionRowDefinition &def ) { OptionRowHandlerList *pHand = new OptionRowHandlerList; FillStyles( pHand, def ); return pHand; }
inline OptionRowHandler* MakeGroups( OptionRowDefinition &def ) { OptionRowHandlerList *pHand = new OptionRowHandlerList; FillGroups( pHand, def ); return pHand; }
inline OptionRowHandler* MakeDifficulties( OptionRowDefinition &def ) { OptionRowHandlerList *pHand = new OptionRowHandlerList; FillDifficulties( pHand, def ); return pHand; }
OptionRowHandler* Make( const Command &cmd, OptionRowDefinition &defOut );
}