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

slight change; UnpauseOnStart -> UnpauseWithStart to match internal metric name

Browse Source
This commit is contained in:
AJ Kelly
2010-07-19 11:19:01 -05:00
parent e036552c94
commit cec320d923
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/metrics.ini
+1 -1
View File
@@ -2837,7 +2837,7 @@ StopCourseEarly=false
ShowEvaluationOnFail=true ShowEvaluationOnFail=true
ShowScoreInRave=false ShowScoreInRave=false
# #
UnpauseOnStart=true UnpauseWithStart=true
# #
InitialBackgroundBrightness=1.0 InitialBackgroundBrightness=1.0
TimerSeconds=-1 TimerSeconds=-1
src/ScreenGameplay.cpp
+6 -4
View File
@@ -353,8 +353,8 @@ void ScreenGameplay::Init()
FAIL_ON_MISS_COMBO.Load( m_sName, "FailOnMissCombo" ); FAIL_ON_MISS_COMBO.Load( m_sName, "FailOnMissCombo" );
ALLOW_CENTER_1_PLAYER.Load( m_sName, "AllowCenter1Player" ); ALLOW_CENTER_1_PLAYER.Load( m_sName, "AllowCenter1Player" );
USE_ALTERNATIVE_INPUT.Load( m_sName, "UseAlternativeInput"); USE_ALTERNATIVE_INPUT.Load( m_sName, "UseAlternativeInput");
//configurable // configurable:
UNPAUSE_WITH_GAME_BUTTON_START.Load( m_sName, "UnpauseOnStart" ); UNPAUSE_WITH_START.Load( m_sName, "UnpauseWithStart")
if( UseSongBackgroundAndForeground() ) if( UseSongBackgroundAndForeground() )
{ {
@@ -2172,10 +2172,12 @@ void ScreenGameplay::Input( const InputEventPlus &input )
if( GAMESTATE->IsHumanPlayer(input.pn) && input.MenuI == GAME_BUTTON_START && input.type == IET_FIRST_PRESS ) if( GAMESTATE->IsHumanPlayer(input.pn) && input.MenuI == GAME_BUTTON_START && input.type == IET_FIRST_PRESS )
{ {
if( m_PauseController == GameController_Invalid || m_PauseController == input.GameI.controller ) if( m_PauseController == GameController_Invalid || m_PauseController == input.GameI.controller )
//IMO is better to have this configurable -DaisuMaster {
if( UNPAUSE_WITH_GAME_BUTTON_START ) // IMO, it's better to have this configurable. -DaisuMaster
if( UNPAUSE_WITH_START )
this->PauseGame( false ); this->PauseGame( false );
} }
}
return; return;
} }
src/ScreenGameplay.h
+1 -1
View File
@@ -151,7 +151,7 @@ protected:
ThemeMetric<int> FAIL_ON_MISS_COMBO; ThemeMetric<int> FAIL_ON_MISS_COMBO;
ThemeMetric<bool> ALLOW_CENTER_1_PLAYER; ThemeMetric<bool> ALLOW_CENTER_1_PLAYER;
ThemeMetric<bool> USE_ALTERNATIVE_INPUT; ThemeMetric<bool> USE_ALTERNATIVE_INPUT;
ThemeMetric<bool> UNPAUSE_WITH_GAME_BUTTON_START; ThemeMetric<bool> UNPAUSE_WITH_START;
vector<AlternateMapping> m_vAlterMap; vector<AlternateMapping> m_vAlterMap;