remove old checkpoints
This commit is contained in:
@@ -737,7 +737,6 @@ void InputMapper::GameToMenu( const GameInput &GameI, MenuInput &MenuI )
|
|||||||
|
|
||||||
void InputMapper::StyleToGame( const StyleInput &StyleI, GameInput &GameI )
|
void InputMapper::StyleToGame( const StyleInput &StyleI, GameInput &GameI )
|
||||||
{
|
{
|
||||||
CHECKPOINT_M( ssprintf("%i %i", StyleI.player, StyleI.col) );
|
|
||||||
const Style* pStyle = GAMESTATE->GetCurrentStyle();
|
const Style* pStyle = GAMESTATE->GetCurrentStyle();
|
||||||
GameI = pStyle->StyleInputToGameInput( StyleI );
|
GameI = pStyle->StyleInputToGameInput( StyleI );
|
||||||
}
|
}
|
||||||
@@ -777,7 +776,6 @@ bool InputMapper::IsButtonDown( const MenuInput &MenuI )
|
|||||||
|
|
||||||
bool InputMapper::IsButtonDown( const StyleInput &StyleI )
|
bool InputMapper::IsButtonDown( const StyleInput &StyleI )
|
||||||
{
|
{
|
||||||
CHECKPOINT_M( ssprintf("%i %i", StyleI.player, StyleI.col) );
|
|
||||||
GameInput GameI;
|
GameInput GameI;
|
||||||
StyleToGame( StyleI, GameI );
|
StyleToGame( StyleI, GameI );
|
||||||
return IsButtonDown( GameI );
|
return IsButtonDown( GameI );
|
||||||
|
|||||||
@@ -546,9 +546,7 @@ void Player::Update( float fDeltaTime )
|
|||||||
// TODO: Remove use of PlayerNumber.
|
// TODO: Remove use of PlayerNumber.
|
||||||
PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
|
PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
|
||||||
|
|
||||||
CHECKPOINT_M( ssprintf("P%i, %i %i", pn, col, iNumCols) );
|
|
||||||
const StyleInput StyleI( pn, col );
|
const StyleInput StyleI( pn, col );
|
||||||
CHECKPOINT_M( ssprintf("P%i %i", StyleI.player, StyleI.col) );
|
|
||||||
bool bIsHoldingButton = INPUTMAPPER->IsButtonDown( StyleI );
|
bool bIsHoldingButton = INPUTMAPPER->IsButtonDown( StyleI );
|
||||||
// TODO: Make this work for non-human-controlled players
|
// TODO: Make this work for non-human-controlled players
|
||||||
if( bIsHoldingButton && !GAMESTATE->m_bDemonstrationOrJukebox && m_pPlayerState->m_PlayerController==PC_HUMAN )
|
if( bIsHoldingButton && !GAMESTATE->m_bDemonstrationOrJukebox && m_pPlayerState->m_PlayerController==PC_HUMAN )
|
||||||
|
|||||||
Reference in New Issue
Block a user