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

CString -> RString

Browse Source
This commit is contained in:
Chris Danford
2006-01-22 01:00:06 +00:00
parent 870ed267fc
commit 7f821e8cfc
578 changed files with 3943 additions and 3946 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsMasterPrefs.h
+7 -7
View File
@@ -12,11 +12,11 @@ static const int MAX_OPTIONS=16;
struct ConfOption
{
static ConfOption *Find( CString name );
static ConfOption *Find( RString name );
/* Name of this option. It's helpful to delimit this with newlines, as it'll
* be the default display title. */
CString name;
RString name;
typedef void (*MoveData_t)( int &sel, bool ToSel, const ConfOption *pConfOption );
MoveData_t MoveData;
int m_iEffects;
@@ -28,7 +28,7 @@ struct ConfOption
/* Return the list of available selections; Get() and Put() use indexes into this
* array. UpdateAvailableOptions() should be called before using this. */
void MakeOptionsList( vector<CString> &out ) const;
void MakeOptionsList( vector<RString> &out ) const;
inline int Get() const { int sel; MoveData( sel, true, this ); return sel; }
inline void Put( int sel ) const { MoveData( sel, false, this ); }
@@ -45,11 +45,11 @@ struct ConfOption
#define PUSH( c ) if(c) names.push_back(c);
PUSH(c0);PUSH(c1);PUSH(c2);PUSH(c3);PUSH(c4);PUSH(c5);PUSH(c6);PUSH(c7);PUSH(c8);PUSH(c9);PUSH(c10);PUSH(c11);PUSH(c12);PUSH(c13);PUSH(c14);PUSH(c15);PUSH(c16);PUSH(c17);PUSH(c18);PUSH(c19);
}
void AddOption( const CString &sName ) { PUSH(sName); }
void AddOption( const RString &sName ) { PUSH(sName); }
#undef PUSH
ConfOption( const char *n, MoveData_t m,
void (*lst)( vector<CString> &out ) )
void (*lst)( vector<RString> &out ) )
{
name = n;
MoveData = m;
@@ -60,8 +60,8 @@ struct ConfOption
// private:
vector<CString> names;
void (*MakeOptionsListCB)( vector<CString> &out );
vector<RString> names;
void (*MakeOptionsListCB)( vector<RString> &out );
};
#endif