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

[ScreenHighScores] Disable forced screen transition behavior when ManualScrolling=true.

Browse Source
This commit is contained in:
AJ Kelly
2011-10-01 14:46:10 -05:00
parent fb346d1bc2
commit dd3b57bd37
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Changelog_sm5.txt
+5
View File
@@ -8,6 +8,11 @@ ________________________________________________________________________________
StepMania 5.0 $next | 201110??
--------------------------------------------------------------------------------
2011/10/01
----------
* [ScreenHighScores] Disable forced screen transition behavior when
ManualScrolling=true. [AJ]
2011/09/30
----------
* [GameState] Added CurrentOptionsDisqualifyPlayer(player),
src/ScreenHighScores.cpp
+8 -5
View File
@@ -232,9 +232,9 @@ void ScreenHighScores::Init()
{
default: ASSERT(0);
case HighScoresType_NonstopCourses: ct = COURSE_TYPE_NONSTOP; break;
case HighScoresType_OniCourses: ct = COURSE_TYPE_ONI; break;
case HighScoresType_OniCourses: ct = COURSE_TYPE_ONI; break;
case HighScoresType_SurvivalCourses: ct = COURSE_TYPE_SURVIVAL; break;
case HighScoresType_AllCourses: ct = CourseType_Invalid; break;
case HighScoresType_AllCourses: ct = CourseType_Invalid; break;
}
m_Scroller.LoadCourses( ct, MAX_ITEMS_TO_SHOW );
@@ -264,8 +264,11 @@ void ScreenHighScores::BeginScreen()
else
m_Scroller.ScrollThroughAllItems();
float fSecs = m_Scroller.GetSecondsForCompleteScrollThrough();
this->PostScreenMessage( SM_BeginFadingOut, fSecs );
if( !MANUAL_SCROLLING )
{
float fSecs = m_Scroller.GetSecondsForCompleteScrollThrough();
this->PostScreenMessage( SM_BeginFadingOut, fSecs );
}
}
void ScreenHighScores::Input( const InputEventPlus &input )
@@ -274,7 +277,7 @@ void ScreenHighScores::Input( const InputEventPlus &input )
if( IsTransitioning() )
return;
// If manually scrolling, then pass the input to Scree::Input so it will call Menu*
// If manually scrolling, pass the input to Screen::Input so it will call Menu*
if( (bool)MANUAL_SCROLLING )
Screen::Input( input );
else