From 51873e1818cad6b0cf623b0f6d1aea490e9886ab Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 16 Jan 2006 04:02:19 +0000 Subject: [PATCH] cleanup --- stepmania/src/OptionRow.h | 64 +++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/stepmania/src/OptionRow.h b/stepmania/src/OptionRow.h index 773214fdc8..849204c1ec 100644 --- a/stepmania/src/OptionRow.h +++ b/stepmania/src/OptionRow.h @@ -92,39 +92,39 @@ public: void Load( const CString &sType ); private: - CString m_sType; + CString m_sType; - BitmapText m_textItemParent; + BitmapText m_textItemParent; OptionsCursor m_UnderlineParent; - Actor *m_sprBullet; - BitmapText m_textTitle; - OptionIcon m_OptionIcon; + Actor *m_sprBullet; + BitmapText m_textTitle; + OptionIcon m_OptionIcon; // metrics - ThemeMetric BULLET_X; + ThemeMetric BULLET_X; ThemeMetric BULLET_ON_COMMAND; - ThemeMetric TITLE_X; + ThemeMetric TITLE_X; ThemeMetric TITLE_ON_COMMAND; ThemeMetric TITLE_GAIN_FOCUS_COMMAND; ThemeMetric TITLE_LOSE_FOCUS_COMMAND; - ThemeMetric ITEMS_START_X; - ThemeMetric ITEMS_END_X; - ThemeMetric ITEMS_GAP_X; - ThemeMetric1D ITEMS_LONG_ROW_X; - ThemeMetric ITEMS_LONG_ROW_SHARED_X; + ThemeMetric ITEMS_START_X; + ThemeMetric ITEMS_END_X; + ThemeMetric ITEMS_GAP_X; + ThemeMetric1D ITEMS_LONG_ROW_X; + ThemeMetric ITEMS_LONG_ROW_SHARED_X; ThemeMetric ITEMS_ON_COMMAND; ThemeMetric ITEM_GAIN_FOCUS_COMMAND; ThemeMetric ITEM_LOSE_FOCUS_COMMAND; - ThemeMetric1D ICONS_X; + ThemeMetric1D ICONS_X; ThemeMetric ICONS_ON_COMMAND; - ThemeMetric COLOR_SELECTED; - ThemeMetric COLOR_NOT_SELECTED; - ThemeMetric COLOR_DISABLED; - ThemeMetric CAPITALIZE_ALL_OPTION_NAMES; - ThemeMetric TWEEN_SECONDS; - ThemeMetric SHOW_BPM_IN_SPEED_TITLE; - ThemeMetric SHOW_OPTION_ICONS; - ThemeMetric SHOW_UNDERLINES; + ThemeMetric COLOR_SELECTED; + ThemeMetric COLOR_NOT_SELECTED; + ThemeMetric COLOR_DISABLED; + ThemeMetric CAPITALIZE_ALL_OPTION_NAMES; + ThemeMetric TWEEN_SECONDS; + ThemeMetric SHOW_BPM_IN_SPEED_TITLE; + ThemeMetric SHOW_OPTION_ICONS; + ThemeMetric SHOW_UNDERLINES; friend class OptionRow; }; @@ -215,24 +215,24 @@ protected: const OptionRowType *m_pParentType; OptionRowDefinition m_RowDef; - RowType m_RowType; + RowType m_RowType; OptionRowHandler* m_pHand; - ActorFrame m_Frame; + ActorFrame m_Frame; - vector m_textItems; // size depends on m_bRowIsLong and which players are joined - vector m_Underline[NUM_PLAYERS]; // size depends on m_bRowIsLong and which players are joined + vector m_textItems; // size depends on m_bRowIsLong and which players are joined + vector m_Underline[NUM_PLAYERS]; // size depends on m_bRowIsLong and which players are joined - Actor *m_sprBullet; - BitmapText *m_textTitle; - OptionIcon *m_OptionIcons[NUM_PLAYERS]; + Actor *m_sprBullet; + BitmapText *m_textTitle; + OptionIcon *m_OptionIcons[NUM_PLAYERS]; - bool m_bFirstItemGoesDown; - bool m_bRowHasFocus[NUM_PLAYERS]; + bool m_bFirstItemGoesDown; + 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 - vector m_vbSelected[NUM_PLAYERS]; // size = m_RowDef.choices.size() + vector m_vbSelected[NUM_PLAYERS]; // size = m_RowDef.choices.size() public: Actor::TweenState m_tsDestination; // this should approach m_tsDestination.