From dc84e156853d9c75d80af02d22faf7ebd169b54d Mon Sep 17 00:00:00 2001
From: auria <auria@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sat, 30 May 2009 18:57:25 +0000
Subject: [PATCH] cleaned up old TuxKart crap left in input module (variables
 id0, id1, id2, whose meaning change from device to device... how brilliant)

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3553 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/gui/state_manager.cpp    |  6 +++---
 src/input/device_manager.cpp |  7 +++----
 src/input/input.hpp          | 15 ++++++---------
 src/input/input_manager.cpp  | 30 +++++++++++++-----------------
 4 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/src/gui/state_manager.cpp b/src/gui/state_manager.cpp
index f90abf859..44d936175 100644
--- a/src/gui/state_manager.cpp
+++ b/src/gui/state_manager.cpp
@@ -394,15 +394,15 @@ namespace StateManager
         
         if(sensedInput->type == Input::IT_KEYBOARD)
         {
-            std::cout << "key " << Input::getInputAsString(Input::IT_KEYBOARD, sensedInput->id0) << std::endl;
+            std::cout << "key " << Input::getInputAsString(Input::IT_KEYBOARD, sensedInput->btnID) << std::endl;
         }
         else if(sensedInput->type == Input::IT_STICKMOTION)
         {
-            std::cout << "gamepad axis " << sensedInput->id0 << " " << sensedInput->id1 << " " << sensedInput->id2 << std::endl;
+            std::cout << "gamepad " << sensedInput->deviceID << "axis  " << sensedInput->btnID << " direction=" << sensedInput->axisDirection << std::endl;
         }
         else if(sensedInput->type == Input::IT_STICKBUTTON)
         {
-            std::cout << "gamepad button " << sensedInput->id0 << " " << sensedInput->id1 << " " << sensedInput->id2 << std::endl;
+            std::cout << "gamepad " << sensedInput->deviceID << " button " << sensedInput->btnID << std::endl;
         }
         
         getCurrentScreen()->dismissModalDialog();
diff --git a/src/input/device_manager.cpp b/src/input/device_manager.cpp
index ca02f09bf..98543a043 100644
--- a/src/input/device_manager.cpp
+++ b/src/input/device_manager.cpp
@@ -79,7 +79,7 @@ void DeviceManager::add(GamePadDevice* d)
     m_gamepad_amount = m_gamepads.size();
 }
 // -----------------------------------------------------------------------------
-bool DeviceManager::mapInputToPlayerAndAction( Input::InputType type, int id0, int id1, int id2, int value,
+bool DeviceManager::mapInputToPlayerAndAction( Input::InputType type, int deviceID, int btnID, int axisDir, int value,
                                               int* player /* out */, PlayerAction* action /* out */ )
 {
     // TODO - auto-detect player ID from device
@@ -89,7 +89,7 @@ bool DeviceManager::mapInputToPlayerAndAction( Input::InputType type, int id0, i
     {
         for(unsigned int n=0; n<m_keyboard_amount; n++)
         {
-            if( m_keyboards[n].hasBinding(id0, action) ) return true;
+            if( m_keyboards[n].hasBinding(btnID, action) ) return true;
         }
         return false;
     }
@@ -99,12 +99,11 @@ bool DeviceManager::mapInputToPlayerAndAction( Input::InputType type, int id0, i
     }
     else if(type == Input::IT_STICKBUTTON || type == Input::IT_STICKMOTION)
     {
-        // std::cout << "stick motion, ID=" <<id0 << " axis=" << id1 << " value=" << value  << std::endl;
         for(unsigned int n=0; n<m_gamepad_amount; n++)
         {
             //std::cout << "checking gamepad #" << n << " out of " << m_gamepad_amount << std::endl;
             
-            if(m_gamepads[n].hasBinding(type, id1 /* axis or button */, value, *player, action /* out */) )
+            if(m_gamepads[n].hasBinding(type, btnID /* axis or button */, value, *player, action /* out */) )
             {
                 //std::cout << "that's the one.\n";
                 return true;
diff --git a/src/input/input.hpp b/src/input/input.hpp
index 6c87d651e..a747dba39 100644
--- a/src/input/input.hpp
+++ b/src/input/input.hpp
@@ -47,15 +47,12 @@ struct Input
     static const int IT_LAST = IT_MOUSEBUTTON;
 
     InputType type;
-    int id0; // FIXME : give meaningful names to these variables...
-    int id1;
-    int id2;
+    int deviceID;
+    int btnID; // or axis ID for gamepads axes
+    int axisDirection;
 
-	// Esoteric C++ feature alarm: structs are classes where the fields and
-	// methods are public by default. I just needed some convenient constructors
-	// for this struct.
 	Input()
-		: type(IT_NONE), id0(0), id1(0), id2(0)
+		: type(IT_NONE), deviceID(0), btnID(0), axisDirection(0)
 	{
 		// Nothing to do.
 	}
@@ -83,8 +80,8 @@ struct Input
 	 * index should be zero. The binding will react to all joysticks connected
 	 * to the system.
 	 */
-	Input(InputType ntype, int nid0 , int nid1 = 0, int nid2= 0) 
-		: type(ntype), id0(nid0), id1(nid1), id2(nid2)
+	Input(InputType ntype, int deviceID , int btnID = 0, int axisDirection= 0) 
+		: type(ntype), deviceID(deviceID), btnID(btnID), axisDirection(axisDirection)
 	{
 		// Nothing to do.
 	}
diff --git a/src/input/input_manager.cpp b/src/input/input_manager.cpp
index a64d3e1c5..5f41790f1 100644
--- a/src/input/input_manager.cpp
+++ b/src/input/input_manager.cpp
@@ -180,17 +180,13 @@ void InputManager::handleStaticAction(int key, int value)
  * Note: It is the obligation of the called menu to switch of the sense mode.
  *
  */
-void InputManager::input(Input::InputType type, int id0, int id1, int id2, 
-                         int value)
+void InputManager::input(Input::InputType type, int deviceID, int btnID, int axisDirection,  int value)
 {
     int player;
     PlayerAction action;
     
-    const bool action_found = m_device_manager->mapInputToPlayerAndAction( type, id0, id1, id2, value, &player, &action );
+    const bool action_found = m_device_manager->mapInputToPlayerAndAction( type, deviceID, btnID, axisDirection, value, &player, &action );
     
-    // std::cout << "Input code=" << id0 << " found=" << action_found << std::endl;
-    
-    //GameAction ga = m_action_map->getEntry(type, id0, id1, id2);
 
     // Act different in input sensing mode.
     if (m_mode >= INPUT_SENSE_PREFER_AXIS && 
@@ -223,9 +219,11 @@ void InputManager::input(Input::InputType type, int id0, int id1, int id2,
             if(store_new)
             {
                 m_sensed_input->type = type;
-                m_sensed_input->id0  = id0;
-                m_sensed_input->id1  = id1;
-                m_sensed_input->id2  = id2;
+                
+                m_sensed_input->deviceID = deviceID;
+                m_sensed_input->btnID = btnID;
+                m_sensed_input->axisDirection = axisDirection;
+                
                 m_max_sensed_input   = abs(value);
                 m_max_sensed_type    = type;
             }
@@ -236,10 +234,8 @@ void InputManager::input(Input::InputType type, int id0, int id1, int id2,
                 StateManager::gotSensedInput(m_sensed_input);
             }
         }
-    }   // if m_mode==INPUT_SENSE_PREFER_{AXIS,BUTTON}
-    else
-
-    if (action_found)
+    } 
+    else if (action_found)
     {
         if(StateManager::isGameState())
             RaceManager::getWorld()->getLocalPlayerKart(player)->action(action, abs(value));
@@ -267,7 +263,7 @@ void InputManager::input(Input::InputType type, int id0, int id1, int id2,
     else if(type == Input::IT_KEYBOARD)
     {
         // keyboard press not handled by device manager / bindings. Check static bindings...
-        handleStaticAction( id0, value );
+        handleStaticAction( btnID, value );
     }
 }   // input
 
@@ -340,7 +336,7 @@ bool InputManager::input(const SEvent& event)
                 return true;
             }
             
-            input(Input::IT_KEYBOARD, key,
+            input(Input::IT_KEYBOARD, 0, key,
 #ifdef HAVE_IRRLICHT
                   // FIXME: not sure why this happens: with plib the unicode
                   // value is 0. Since all values defined in user_config 
@@ -354,12 +350,12 @@ bool InputManager::input(const SEvent& event)
 #else
                   ev.key.keysym.unicode, 
 #endif
-                  0, MAX_VALUE);
+                  MAX_VALUE);
             
         }
         else
         {
-            input(Input::IT_KEYBOARD, key, 0, 0, 0);
+            input(Input::IT_KEYBOARD, 0, key, 0, 0);
         }
     }
 #if 0 // in case we ever use mouse in-game...