From 8329d2babef1750a201d90286e3553c3d33da418 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Wed, 6 Dec 2006 07:16:38 +0000 Subject: [PATCH] If the column is invalid, return. --- stepmania/src/ScreenGameplay.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 0b19d0c643..f2193c99f9 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -2183,6 +2183,9 @@ void ScreenGameplay::Input( const InputEventPlus &input ) bool bRelease = input.type == IET_RELEASE; const int iCol = GAMESTATE->GetCurrentStyle()->GameInputToColumn( input.GameI ); + if( iCol == Column_Invalid ) + return; + // Don't pass on any inputs to Player that aren't a press or a release. switch( input.type ) { @@ -2195,12 +2198,8 @@ void ScreenGameplay::Input( const InputEventPlus &input ) if( GAMESTATE->m_bMultiplayer ) { - if( input.mp != MultiPlayer_Invalid && - iCol != Column_Invalid && - GAMESTATE->IsMultiPlayerEnabled(input.mp) ) - { + if( input.mp != MultiPlayer_Invalid && GAMESTATE->IsMultiPlayerEnabled(input.mp) ) m_vPlayerInfo[input.mp].m_pPlayer->Step( iCol, -1, input.DeviceI.ts, false, bRelease ); - } } else {