From 0df9785a7989001c716c13163611191b6f1174c7 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sun, 3 Sep 2006 02:01:43 +0000 Subject: [PATCH] Fix input strangeness. I don't understand the rational for setting mp when GAMESTATE->m_bMultiplayer is false, but this preserves that changing Game, Style, and Menu inputs when it is false. --- stepmania/src/StepMania.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 8f114ba8bb..d3c721b728 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -1417,13 +1417,18 @@ void HandleInputEvents(float fDeltaTime) { DeviceInput diTemp = input.DeviceI; diTemp.device = DEVICE_JOY1; + GameInput gi; //LOG->Trace( "device %d, %d", diTemp.device, diTemp.button ); - if( INPUTMAPPER->DeviceToGame(diTemp, input.GameI) ) + if( INPUTMAPPER->DeviceToGame(diTemp, gi) ) { - //LOG->Trace( "game %d %d", input.GameI.controller, input.GameI.button ); - INPUTMAPPER->GameToStyle( input.GameI, input.StyleI ); - INPUTMAPPER->GameToMenu( input.GameI, input.MenuI ); + if( GAMESTATE->m_bMultiplayer ) + { + input.GameI = gi; + //LOG->Trace( "game %d %d", input.GameI.controller, input.GameI.button ); + INPUTMAPPER->GameToStyle( input.GameI, input.StyleI ); + INPUTMAPPER->GameToMenu( input.GameI, input.MenuI ); + } //LOG->Trace( "style %d %d", input.StyleI.player, input.StyleI.col ); //LOG->Trace( "menu %d %d", input.MenuI.player, input.MenuI.button );