[ScreenSelectMusic] add a code for closing the current folder from any location (a la DDR X2)
[metric will be added with the next batch of theme commits]
This commit is contained in:
@@ -14,6 +14,11 @@ sm-ssc v1.0 Release Candidate 2 | 201007xx
|
|||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
(work in progress, it's not out yet [hence the "xx" above].)
|
(work in progress, it's not out yet [hence the "xx" above].)
|
||||||
|
|
||||||
|
20100706
|
||||||
|
--------
|
||||||
|
* [ScreenSelectMusic] add a code for closing the current folder from any
|
||||||
|
location (a la DDR X2).
|
||||||
|
|
||||||
20100705
|
20100705
|
||||||
--------
|
--------
|
||||||
* [Player] add RequireStepOnMines metric. This allows DDR's Shock Arrows to
|
* [Player] add RequireStepOnMines metric. This allows DDR's Shock Arrows to
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ const char *CodeNames[] = {
|
|||||||
"SaveScreenshot2",
|
"SaveScreenshot2",
|
||||||
"CancelAllPlayerOptions",
|
"CancelAllPlayerOptions",
|
||||||
"BackInEventMode",
|
"BackInEventMode",
|
||||||
|
"CloseCurrentFolder",
|
||||||
};
|
};
|
||||||
XToString( Code );
|
XToString( Code );
|
||||||
|
|
||||||
@@ -76,6 +77,11 @@ void CodeDetector::RefreshCacheItems( RString sClass )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CodeDetector::EnteredCloseFolder( GameController controller )
|
||||||
|
{
|
||||||
|
return EnteredCode(controller,CODE_CLOSE_CURRENT_FOLDER);
|
||||||
|
}
|
||||||
|
|
||||||
bool CodeDetector::EnteredNextGroup( GameController controller )
|
bool CodeDetector::EnteredNextGroup( GameController controller )
|
||||||
{
|
{
|
||||||
return EnteredCode(controller,CODE_NEXT_GROUP);
|
return EnteredCode(controller,CODE_NEXT_GROUP);
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ enum Code {
|
|||||||
CODE_SAVE_SCREENSHOT2,
|
CODE_SAVE_SCREENSHOT2,
|
||||||
CODE_CANCEL_ALL_PLAYER_OPTIONS,
|
CODE_CANCEL_ALL_PLAYER_OPTIONS,
|
||||||
CODE_BACK_IN_EVENT_MODE,
|
CODE_BACK_IN_EVENT_MODE,
|
||||||
|
CODE_CLOSE_CURRENT_FOLDER,
|
||||||
NUM_Code // leave this at the end
|
NUM_Code // leave this at the end
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -60,6 +61,7 @@ public:
|
|||||||
static bool EnteredCode( GameController controller, Code code );
|
static bool EnteredCode( GameController controller, Code code );
|
||||||
static bool EnteredPrevGroup( GameController controller );
|
static bool EnteredPrevGroup( GameController controller );
|
||||||
static bool EnteredNextGroup( GameController controller );
|
static bool EnteredNextGroup( GameController controller );
|
||||||
|
static bool EnteredCloseFolder( GameController controller );
|
||||||
|
|
||||||
// todo: move to PlayerOptions.h -aj
|
// todo: move to PlayerOptions.h -aj
|
||||||
void ChangeScrollSpeed( GameController controller, bool bIncrement );
|
void ChangeScrollSpeed( GameController controller, bool bIncrement );
|
||||||
|
|||||||
@@ -739,6 +739,18 @@ bool ScreenSelectMusic::DetectCodes( const InputEventPlus &input )
|
|||||||
AfterMusicChange();
|
AfterMusicChange();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if( CodeDetector::EnteredCloseFolder(input.GameI.controller) )
|
||||||
|
{
|
||||||
|
if( GAMESTATE->IsAnExtraStageAndSelectionLocked() )
|
||||||
|
m_soundLocked.Play();
|
||||||
|
else
|
||||||
|
{
|
||||||
|
RString sCurSection = m_MusicWheel.GetSelectedSection();
|
||||||
|
m_MusicWheel.SelectSection(sCurSection);
|
||||||
|
m_MusicWheel.SetOpenSection("");
|
||||||
|
AfterMusicChange();
|
||||||
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
Reference in New Issue
Block a user