Fixed the issue related to trigging holdheads before they reach the receptor, at least I think that, more tests to be done (issue 150)
This commit is contained in:
+4
-1
@@ -2005,7 +2005,10 @@ void Player::StepStrumHopo( int col, int row, const RageTimer &tm, bool bHeld, b
|
||||
break;
|
||||
|
||||
case TapNote::hold_head:
|
||||
if( !REQUIRE_STEP_ON_HOLD_HEADS && fNoteOffset > 0.f )
|
||||
//oh wow, this was causing the trigger
|
||||
//before the hold heads -DaisuMaster
|
||||
//(It was >)
|
||||
if( !REQUIRE_STEP_ON_HOLD_HEADS && fNoteOffset <= 0.f )
|
||||
{
|
||||
score = TNS_W1;
|
||||
break;
|
||||
|
||||
@@ -353,6 +353,8 @@ void ScreenGameplay::Init()
|
||||
FAIL_ON_MISS_COMBO.Load( m_sName, "FailOnMissCombo" );
|
||||
ALLOW_CENTER_1_PLAYER.Load( m_sName, "AllowCenter1Player" );
|
||||
USE_ALTERNATIVE_INPUT.Load( m_sName, "UseAlternativeInput");
|
||||
//configurable
|
||||
UNPAUSE_WITH_GAME_BUTTON_START.Load( m_sName, "AllowUnpausingWithGameButtonStart" );
|
||||
|
||||
if( UseSongBackgroundAndForeground() )
|
||||
{
|
||||
@@ -2170,7 +2172,9 @@ void ScreenGameplay::Input( const InputEventPlus &input )
|
||||
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 )
|
||||
this->PauseGame( false );
|
||||
//IMO is better to have this configurable -DaisuMaster
|
||||
if( UNPAUSE_WITH_GAME_BUTTON_START )
|
||||
this->PauseGame( false );
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -151,6 +151,7 @@ protected:
|
||||
ThemeMetric<int> FAIL_ON_MISS_COMBO;
|
||||
ThemeMetric<bool> ALLOW_CENTER_1_PLAYER;
|
||||
ThemeMetric<bool> USE_ALTERNATIVE_INPUT;
|
||||
ThemeMetric<bool> UNPAUSE_WITH_GAME_BUTTON_START;
|
||||
|
||||
vector<AlternateMapping> m_vAlterMap;
|
||||
|
||||
|
||||
@@ -732,18 +732,18 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
|
||||
|
||||
bool ScreenSelectMusic::DetectCodes( const InputEventPlus &input )
|
||||
{
|
||||
if( CodeDetector::EnteredPrevSteps(input.GameI.controller) )
|
||||
if( CodeDetector::EnteredPrevSteps(input.GameI.controller) && !CHANGE_STEPS_WITH_GAME_BUTTONS )
|
||||
{
|
||||
if( GAMESTATE->IsAnExtraStageAndSelectionLocked() )
|
||||
m_soundLocked.Play();
|
||||
else
|
||||
ChangeSteps( input.pn, -1 );
|
||||
}
|
||||
else if( CodeDetector::EnteredNextSteps(input.GameI.controller) )
|
||||
else if( CodeDetector::EnteredNextSteps(input.GameI.controller) && !CHANGE_STEPS_WITH_GAME_BUTTONS )
|
||||
{
|
||||
if( GAMESTATE->IsAnExtraStageAndSelectionLocked() )
|
||||
m_soundLocked.Play();
|
||||
else
|
||||
else
|
||||
ChangeSteps( input.pn, +1 );
|
||||
}
|
||||
else if( CodeDetector::EnteredModeMenu(input.GameI.controller) )
|
||||
@@ -792,7 +792,6 @@ bool ScreenSelectMusic::DetectCodes( const InputEventPlus &input )
|
||||
m_MusicWheel.SelectSection(sNewGroup);
|
||||
m_MusicWheel.SetOpenSection(sNewGroup);
|
||||
AfterMusicChange();
|
||||
//m_MusicWheel.
|
||||
}
|
||||
}
|
||||
else if( CodeDetector::EnteredCloseFolder(input.GameI.controller) )
|
||||
|
||||
Reference in New Issue
Block a user