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

add m_aButtonsToNotHold

Browse Source
This commit is contained in:
Glenn Maynard
2007-04-25 20:24:13 +00:00
parent 9bbed8657d
commit 5f34c4bab3
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/InputQueue.cpp
+22 -5
View File
@@ -63,7 +63,10 @@ bool InputQueueCode::EnteredCode( GameController controller ) const
return false; return false;
RageTimer OldestTimeAllowed; RageTimer OldestTimeAllowed;
OldestTimeAllowed += -m_fMaxSecondsBack; if( m_fMaxSecondsBack == -1 )
OldestTimeAllowed.SetZero();
else
OldestTimeAllowed += -m_fMaxSecondsBack;
// iterate newest to oldest // iterate newest to oldest
int iSequenceIndex = m_aPresses.size()-1; // count down int iSequenceIndex = m_aPresses.size()-1; // count down
@@ -72,7 +75,7 @@ bool InputQueueCode::EnteredCode( GameController controller ) const
while( iQueueIndex >= 0 ) while( iQueueIndex >= 0 )
{ {
/* If the buttons are too old, stop searching because we're not going to find a match. */ /* If the buttons are too old, stop searching because we're not going to find a match. */
if( aQueue[iQueueIndex].DeviceI.ts < OldestTimeAllowed ) if( !OldestTimeAllowed.IsZero() && aQueue[iQueueIndex].DeviceI.ts < OldestTimeAllowed )
return false; return false;
/* If the last press is an input type we're not interested in, skip it /* If the last press is an input type we're not interested in, skip it
@@ -114,14 +117,20 @@ bool InputQueueCode::EnteredCode( GameController controller ) const
break; // didn't find the button break; // didn't find the button
// Check that m_aButtonsToHold were being held when the buttons were pressed. // Check that m_aButtonsToHold were being held when the buttons were pressed.
bool bAllButtonsPressed = true; bool bAllHeldButtonsOK = true;
for( unsigned i=0; i<Press.m_aButtonsToHold.size(); i++ ) for( unsigned i=0; i<Press.m_aButtonsToHold.size(); i++ )
{ {
GameInput gi( controller, Press.m_aButtonsToHold[i] ); GameInput gi( controller, Press.m_aButtonsToHold[i] );
if( !INPUTMAPPER->IsBeingPressed(gi, MultiPlayer_Invalid, &pIEP->InputList) ) if( !INPUTMAPPER->IsBeingPressed(gi, MultiPlayer_Invalid, &pIEP->InputList) )
bAllButtonsPressed = false; bAllHeldButtonsOK = false;
} }
if( !bAllButtonsPressed ) for( unsigned i=0; i<Press.m_aButtonsToNotHold.size(); i++ )
{
GameInput gi( controller, Press.m_aButtonsToNotHold[i] );
if( INPUTMAPPER->IsBeingPressed(gi, MultiPlayer_Invalid, &pIEP->InputList) )
bAllHeldButtonsOK = false;
}
if( !bAllHeldButtonsOK )
continue; continue;
if( b == (int) Press.m_aButtonsToPress.size()-1 ) if( b == (int) Press.m_aButtonsToPress.size()-1 )
{ {
@@ -180,6 +189,7 @@ bool InputQueueCode::Load( RString sButtonsNames )
RString sButtonName = asButtonNames[i]; RString sButtonName = asButtonNames[i];
bool bHold = false; bool bHold = false;
bool bNotHold = false;
while(1) while(1)
{ {
if( sButtonName.Left(1) == "+" ) if( sButtonName.Left(1) == "+" )
@@ -198,6 +208,11 @@ bool InputQueueCode::Load( RString sButtonsNames )
sButtonName.erase(0, 1); sButtonName.erase(0, 1);
bHold = true; bHold = true;
} }
else if( sButtonName.Left(1) == "!" )
{
sButtonName.erase(0, 1);
bNotHold = true;
}
else else
{ {
break; break;
@@ -215,6 +230,8 @@ bool InputQueueCode::Load( RString sButtonsNames )
if( bHold ) if( bHold )
m_aPresses.back().m_aButtonsToHold.push_back( gb ); m_aPresses.back().m_aButtonsToHold.push_back( gb );
else if( bNotHold )
m_aPresses.back().m_aButtonsToNotHold.push_back( gb );
else else
m_aPresses.back().m_aButtonsToPress.push_back( gb ); m_aPresses.back().m_aButtonsToPress.push_back( gb );
} }
stepmania/src/InputQueue.h
+1
View File
@@ -34,6 +34,7 @@ private:
{ {
ButtonPress() { m_bAllowIntermediatePresses = false; memset( m_InputTypes, 0, sizeof(m_InputTypes) ); m_InputTypes[IET_FIRST_PRESS] = true; } ButtonPress() { m_bAllowIntermediatePresses = false; memset( m_InputTypes, 0, sizeof(m_InputTypes) ); m_InputTypes[IET_FIRST_PRESS] = true; }
vector<GameButton> m_aButtonsToHold; vector<GameButton> m_aButtonsToHold;
vector<GameButton> m_aButtonsToNotHold;
vector<GameButton> m_aButtonsToPress; vector<GameButton> m_aButtonsToPress;
bool m_InputTypes[NUM_InputEventType]; bool m_InputTypes[NUM_InputEventType];