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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-16 04:02:19 +00:00
parent a00ff1269f
commit 51873e1818
1 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRow.h
+32 -32
View File
@@ -92,39 +92,39 @@ public:
void Load( const CString &sType ); void Load( const CString &sType );
private: private:
CString m_sType; CString m_sType;
BitmapText m_textItemParent; BitmapText m_textItemParent;
OptionsCursor m_UnderlineParent; OptionsCursor m_UnderlineParent;
Actor *m_sprBullet; Actor *m_sprBullet;
BitmapText m_textTitle; BitmapText m_textTitle;
OptionIcon m_OptionIcon; OptionIcon m_OptionIcon;
// metrics // metrics
ThemeMetric<float> BULLET_X; ThemeMetric<float> BULLET_X;
ThemeMetric<apActorCommands> BULLET_ON_COMMAND; ThemeMetric<apActorCommands> BULLET_ON_COMMAND;
ThemeMetric<float> TITLE_X; ThemeMetric<float> TITLE_X;
ThemeMetric<apActorCommands> TITLE_ON_COMMAND; ThemeMetric<apActorCommands> TITLE_ON_COMMAND;
ThemeMetric<apActorCommands> TITLE_GAIN_FOCUS_COMMAND; ThemeMetric<apActorCommands> TITLE_GAIN_FOCUS_COMMAND;
ThemeMetric<apActorCommands> TITLE_LOSE_FOCUS_COMMAND; ThemeMetric<apActorCommands> TITLE_LOSE_FOCUS_COMMAND;
ThemeMetric<float> ITEMS_START_X; ThemeMetric<float> ITEMS_START_X;
ThemeMetric<float> ITEMS_END_X; ThemeMetric<float> ITEMS_END_X;
ThemeMetric<float> ITEMS_GAP_X; ThemeMetric<float> ITEMS_GAP_X;
ThemeMetric1D<float> ITEMS_LONG_ROW_X; ThemeMetric1D<float> ITEMS_LONG_ROW_X;
ThemeMetric<float> ITEMS_LONG_ROW_SHARED_X; ThemeMetric<float> ITEMS_LONG_ROW_SHARED_X;
ThemeMetric<apActorCommands> ITEMS_ON_COMMAND; ThemeMetric<apActorCommands> ITEMS_ON_COMMAND;
ThemeMetric<apActorCommands> ITEM_GAIN_FOCUS_COMMAND; ThemeMetric<apActorCommands> ITEM_GAIN_FOCUS_COMMAND;
ThemeMetric<apActorCommands> ITEM_LOSE_FOCUS_COMMAND; ThemeMetric<apActorCommands> ITEM_LOSE_FOCUS_COMMAND;
ThemeMetric1D<float> ICONS_X; ThemeMetric1D<float> ICONS_X;
ThemeMetric<apActorCommands> ICONS_ON_COMMAND; ThemeMetric<apActorCommands> ICONS_ON_COMMAND;
ThemeMetric<RageColor> COLOR_SELECTED; ThemeMetric<RageColor> COLOR_SELECTED;
ThemeMetric<RageColor> COLOR_NOT_SELECTED; ThemeMetric<RageColor> COLOR_NOT_SELECTED;
ThemeMetric<RageColor> COLOR_DISABLED; ThemeMetric<RageColor> COLOR_DISABLED;
ThemeMetric<bool> CAPITALIZE_ALL_OPTION_NAMES; ThemeMetric<bool> CAPITALIZE_ALL_OPTION_NAMES;
ThemeMetric<float> TWEEN_SECONDS; ThemeMetric<float> TWEEN_SECONDS;
ThemeMetric<bool> SHOW_BPM_IN_SPEED_TITLE; ThemeMetric<bool> SHOW_BPM_IN_SPEED_TITLE;
ThemeMetric<bool> SHOW_OPTION_ICONS; ThemeMetric<bool> SHOW_OPTION_ICONS;
ThemeMetric<bool> SHOW_UNDERLINES; ThemeMetric<bool> SHOW_UNDERLINES;
friend class OptionRow; friend class OptionRow;
}; };
@@ -215,24 +215,24 @@ protected:
const OptionRowType *m_pParentType; const OptionRowType *m_pParentType;
OptionRowDefinition m_RowDef; OptionRowDefinition m_RowDef;
RowType m_RowType; RowType m_RowType;
OptionRowHandler* m_pHand; OptionRowHandler* m_pHand;
ActorFrame m_Frame; ActorFrame m_Frame;
vector<BitmapText *> m_textItems; // size depends on m_bRowIsLong and which players are joined vector<BitmapText *> m_textItems; // size depends on m_bRowIsLong and which players are joined
vector<OptionsCursor *> m_Underline[NUM_PLAYERS]; // size depends on m_bRowIsLong and which players are joined vector<OptionsCursor *> m_Underline[NUM_PLAYERS]; // size depends on m_bRowIsLong and which players are joined
Actor *m_sprBullet; Actor *m_sprBullet;
BitmapText *m_textTitle; BitmapText *m_textTitle;
OptionIcon *m_OptionIcons[NUM_PLAYERS]; OptionIcon *m_OptionIcons[NUM_PLAYERS];
bool m_bFirstItemGoesDown; bool m_bFirstItemGoesDown;
bool m_bRowHasFocus[NUM_PLAYERS]; bool m_bRowHasFocus[NUM_PLAYERS];
int m_iChoiceInRowWithFocus[NUM_PLAYERS]; // this choice has input focus int m_iChoiceInRowWithFocus[NUM_PLAYERS]; // this choice has input focus
// Only one will true at a time if m_RowDef.bMultiSelect // Only one will true at a time if m_RowDef.bMultiSelect
vector<bool> m_vbSelected[NUM_PLAYERS]; // size = m_RowDef.choices.size() vector<bool> m_vbSelected[NUM_PLAYERS]; // size = m_RowDef.choices.size()
public: public:
Actor::TweenState m_tsDestination; // this should approach m_tsDestination. Actor::TweenState m_tsDestination; // this should approach m_tsDestination.