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

improve abstraction

Browse Source
This commit is contained in:
Glenn Maynard
2003-05-30 21:36:56 +00:00
parent 982dc7551e
commit a4e563114a
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptions.h
+9 -5
View File
@@ -84,16 +84,21 @@ protected:
void MenuUp( PlayerNumber pn ); void MenuUp( PlayerNumber pn );
void MenuDown( PlayerNumber pn ); void MenuDown( PlayerNumber pn );
int GetCurrentRow(PlayerNumber pn = PLAYER_1) const { return m_iCurrentRow[pn]; }
MenuElements m_Menu;
OptionRow* m_OptionRow;
int m_iSelectedOption[NUM_PLAYERS][MAX_OPTION_LINES];
private:
CString m_sName; CString m_sName;
InputMode m_InputMode; InputMode m_InputMode;
bool m_bUseIcons; bool m_bUseIcons;
bool m_bLoadExplanations; bool m_bLoadExplanations;
OptionRow* m_OptionRow;
int m_iNumOptionRows; int m_iNumOptionRows;
MenuElements m_Menu;
ActorFrame m_framePage; ActorFrame m_framePage;
Sprite m_sprPage; Sprite m_sprPage;
Sprite m_sprBullets[MAX_OPTION_LINES]; Sprite m_sprBullets[MAX_OPTION_LINES];
@@ -101,14 +106,13 @@ protected:
BitmapText m_textItems[MAX_OPTION_LINES][MAX_OPTIONS_PER_LINE]; // this array has to be big enough to hold all of the options BitmapText m_textItems[MAX_OPTION_LINES][MAX_OPTIONS_PER_LINE]; // this array has to be big enough to hold all of the options
bool m_bRowIsLong[MAX_OPTION_LINES]; // goes off edge of screen bool m_bRowIsLong[MAX_OPTION_LINES]; // goes off edge of screen
int m_iSelectedOption[NUM_PLAYERS][MAX_OPTION_LINES];
int m_iCurrentRow[NUM_PLAYERS]; int m_iCurrentRow[NUM_PLAYERS];
OptionsCursor m_Underline[NUM_PLAYERS][MAX_OPTION_LINES]; OptionsCursor m_Underline[NUM_PLAYERS][MAX_OPTION_LINES];
OptionIcon m_OptionIcons[NUM_PLAYERS][MAX_OPTION_LINES]; OptionIcon m_OptionIcons[NUM_PLAYERS][MAX_OPTION_LINES];
OptionsCursor m_Highlight[NUM_PLAYERS]; OptionsCursor m_Highlight[NUM_PLAYERS];
private:
BitmapText m_textExplanation; BitmapText m_textExplanation;
RageSound m_SoundChangeCol; RageSound m_SoundChangeCol;
stepmania/src/ScreenOptionsMenu.cpp
+1 -1
View File
@@ -95,7 +95,7 @@ void ScreenOptionsMenu::GoToPrevState()
void ScreenOptionsMenu::GoToNextState() void ScreenOptionsMenu::GoToNextState()
{ {
switch( this->m_iCurrentRow[0] ) switch( this->GetCurrentRow() )
{ {
case OM_APPEARANCE: SCREENMAN->SetNewScreen("ScreenAppearanceOptions"); break; case OM_APPEARANCE: SCREENMAN->SetNewScreen("ScreenAppearanceOptions"); break;
case OM_AUTO_GRAPHIC: SCREENMAN->SetNewScreen("ScreenAutoGraphicDetail"); break; case OM_AUTO_GRAPHIC: SCREENMAN->SetNewScreen("ScreenAutoGraphicDetail"); break;