From 94780b3fad501243da87711df3332e704bd17949 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 1 Jul 2006 02:16:38 +0000
Subject: [PATCH] support MultiPlayer inputs

---
 stepmania/src/InputMapper.cpp | 21 ++++++++++++++-------
 stepmania/src/InputMapper.h   |  8 ++++----
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index a08f2d0cc0..0ce36cd095 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -784,15 +784,19 @@ void InputMapper::MenuToGame( const MenuInput &MenuI, GameInput GameIout[4] )
 }
 
 
-bool InputMapper::IsButtonDown( const GameInput &GameI )
+bool InputMapper::IsButtonDown( const GameInput &GameI, MultiPlayer mp )
 {
 	for( int i=0; i<NUM_GAME_TO_DEVICE_SLOTS; i++ )
 	{
 		DeviceInput DeviceI;
 
 		if( GameToDevice( GameI, i, DeviceI ) )
+		{
+			if( mp != MultiPlayer_INVALID )
+				DeviceI.device = MultiPlayerToInputDevice(mp);
 			if( INPUTFILTER->IsBeingPressed( DeviceI ) )
 				return true;
+		}
 	}
 
 	return false;
@@ -809,24 +813,27 @@ bool InputMapper::IsButtonDown( const MenuInput &MenuI )
 	return false;
 }
 
-bool InputMapper::IsButtonDown( const StyleInput &StyleI )
+bool InputMapper::IsButtonDown( const StyleInput &StyleI, MultiPlayer mp )
 {
 	GameInput GameI;
 	StyleToGame( StyleI, GameI );
-	return IsButtonDown( GameI );
+	return IsButtonDown( GameI, mp );
 }
 
 
-float InputMapper::GetSecsHeld( const GameInput &GameI )
+float InputMapper::GetSecsHeld( const GameInput &GameI, MultiPlayer mp )
 {
 	float fMaxSecsHeld = 0;
 
 	for( int i=0; i<NUM_GAME_TO_DEVICE_SLOTS; i++ )
 	{
 		DeviceInput DeviceI;
-
 		if( GameToDevice( GameI, i, DeviceI ) )
+		{
+			if( mp != MultiPlayer_INVALID )
+				DeviceI.device = MultiPlayerToInputDevice(mp);
 			fMaxSecsHeld = max( fMaxSecsHeld, INPUTFILTER->GetSecsHeld(DeviceI) );
+		}
 	}
 
 	return fMaxSecsHeld;
@@ -845,11 +852,11 @@ float InputMapper::GetSecsHeld( const MenuInput &MenuI )
 	return fMaxSecsHeld;
 }
 
-float InputMapper::GetSecsHeld( const StyleInput &StyleI )
+float InputMapper::GetSecsHeld( const StyleInput &StyleI, MultiPlayer mp )
 {
 	GameInput GameI;
 	StyleToGame( StyleI, GameI );
-	return GetSecsHeld( GameI );
+	return GetSecsHeld( GameI, mp );
 }
 
 void InputMapper::ResetKeyRepeat( const GameInput &GameI )
diff --git a/stepmania/src/InputMapper.h b/stepmania/src/InputMapper.h
index df6a6bd2ef..ff96eac926 100644
--- a/stepmania/src/InputMapper.h
+++ b/stepmania/src/InputMapper.h
@@ -44,13 +44,13 @@ public:
 	void GameToMenu( const GameInput &GameI, MenuInput &MenuI );
 	void MenuToGame( const MenuInput &MenuI, GameInput GameIout[4] );
 
-	float GetSecsHeld( const GameInput &GameI );
+	float GetSecsHeld( const GameInput &GameI, MultiPlayer mp = MultiPlayer_INVALID );
 	float GetSecsHeld( const MenuInput &MenuI );
-	float GetSecsHeld( const StyleInput &StyleI );
+	float GetSecsHeld( const StyleInput &StyleI, MultiPlayer mp = MultiPlayer_INVALID );
 
-	bool IsButtonDown( const GameInput &GameI );
+	bool IsButtonDown( const GameInput &GameI, MultiPlayer mp = MultiPlayer_INVALID );
 	bool IsButtonDown( const MenuInput &MenuI );
-	bool IsButtonDown( const StyleInput &StyleI );
+	bool IsButtonDown( const StyleInput &StyleI, MultiPlayer mp = MultiPlayer_INVALID );
 
 	void ResetKeyRepeat( const GameInput &GameI );
 	void ResetKeyRepeat( const MenuInput &MenuI );