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

Small wheel-related cleanups

Browse Source
This commit is contained in:
AJ Kelly
2010-05-22 10:05:25 -05:00
parent 40bd873561
commit 77b0f48bf0
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MusicWheel.h
+5 -5
View File
@@ -23,8 +23,8 @@ public:
virtual void Load( RString sType ); virtual void Load( RString sType );
void BeginScreen(); void BeginScreen();
bool ChangeSort( SortOrder new_so ); // return true if change successful bool ChangeSort( SortOrder new_so ); // return true if change successful
bool NextSort(); // return true if change successful bool NextSort(); // return true if change successful
void StartRoulette(); void StartRoulette();
void StartRandom(); void StartRandom();
bool IsRouletting() const; bool IsRouletting() const;
@@ -71,15 +71,15 @@ protected:
ThemeMetric<float> ROULETTE_SWITCH_SECONDS; ThemeMetric<float> ROULETTE_SWITCH_SECONDS;
ThemeMetric<int> ROULETTE_SLOW_DOWN_SWITCHES; ThemeMetric<int> ROULETTE_SLOW_DOWN_SWITCHES;
ThemeMetric<int> NUM_SECTION_COLORS; ThemeMetric<int> NUM_SECTION_COLORS;
ThemeMetric<RageColor> SONG_REAL_EXTRA_COLOR; ThemeMetric<RageColor> SONG_REAL_EXTRA_COLOR;
ThemeMetric<RageColor> SORT_MENU_COLOR; ThemeMetric<RageColor> SORT_MENU_COLOR;
ThemeMetric<bool> SHOW_ROULETTE; ThemeMetric<bool> SHOW_ROULETTE;
ThemeMetric<bool> SHOW_RANDOM; ThemeMetric<bool> SHOW_RANDOM;
ThemeMetric<bool> SHOW_PORTAL; ThemeMetric<bool> SHOW_PORTAL;
ThemeMetric<bool> RANDOM_PICKS_LOCKED_SONGS; ThemeMetric<bool> RANDOM_PICKS_LOCKED_SONGS;
ThemeMetric<int> MOST_PLAYED_SONGS_TO_SHOW; ThemeMetric<int> MOST_PLAYED_SONGS_TO_SHOW;
ThemeMetric<int> RECENT_SONGS_TO_SHOW; ThemeMetric<int> RECENT_SONGS_TO_SHOW;
ThemeMetric<RString> MODE_MENU_CHOICE_NAMES; ThemeMetric<RString> MODE_MENU_CHOICE_NAMES;
ThemeMetricMap<RString> CHOICE; ThemeMetricMap<RString> CHOICE;
ThemeMetric1D<RageColor> SECTION_COLORS; ThemeMetric1D<RageColor> SECTION_COLORS;
ThemeMetric<LuaReference> SORT_ORDERS; ThemeMetric<LuaReference> SORT_ORDERS;
src/WheelBase.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
virtual void ChangeMusic(int dist); /* +1 or -1 */ virtual void ChangeMusic(int dist); /* +1 or -1 */
virtual void SetOpenSection( RString group ) { } virtual void SetOpenSection( RString group ) { }
/* Return true if we're moving fast automatically. */ // Return true if we're moving fast automatically.
int IsMoving() const; int IsMoving() const;
bool IsSettled() const; bool IsSettled() const;
src/WheelItemBase.h
+6 -6
View File
@@ -28,9 +28,9 @@ struct WheelItemBaseData
WheelItemBaseData() {} WheelItemBaseData() {}
WheelItemBaseData( WheelItemDataType type, RString sText, RageColor color ); WheelItemBaseData( WheelItemDataType type, RString sText, RageColor color );
virtual ~WheelItemBaseData() {} virtual ~WheelItemBaseData() {}
WheelItemDataType m_Type; WheelItemDataType m_Type;
RString m_sText; RString m_sText;
RageColor m_color; // either text color or section background color RageColor m_color; // either text color or section background color
}; };
class WheelItemBase : public ActorFrame class WheelItemBase : public ActorFrame
@@ -47,15 +47,15 @@ public:
virtual void LoadFromWheelItemData( const WheelItemBaseData* pWID, int iIndex, bool bHasFocus, int iDrawIndex ); virtual void LoadFromWheelItemData( const WheelItemBaseData* pWID, int iIndex, bool bHasFocus, int iDrawIndex );
RageColor m_colorLocked; RageColor m_colorLocked;
protected: protected:
void SetGrayBar( Actor *pBar ) { m_pGrayBar = pBar; } void SetGrayBar( Actor *pBar ) { m_pGrayBar = pBar; }
const WheelItemBaseData* m_pData; const WheelItemBaseData* m_pData;
bool m_bExpanded; // if TYPE_SECTION, whether this section is expanded bool m_bExpanded; // if TYPE_SECTION whether this section is expanded
Actor* m_pGrayBar; Actor* m_pGrayBar;
}; };
#endif #endif