-

Author: codenamecpp

gamedata/config/inputs.json.default

@@ -4,55 +4,43 @@
         "controller_type": "Keyboard",
         "keys":
         {
-            "in_car":
-            {
-                "LeaveCar": "Enter",
-                "HandBrake": "Space",
-                "Accelerate": "Up",
-                "Reverse": "Down",
-                "SteerLeft": "Left",
-                "SteerRight": "Right",
-                "Horn": "Tab"
-            },
-            "on_foot":
-            {
-                "TurnLeft": "Left",
-                "TurnRight": "Right",
-                "Jump": "Space",
-                "WalkBackward": "Down",
-                "Run": "Up",
-                "Shoot": "LCtrl",
-                "NextWeapon": "x",
-                "PrevWeapon": "z",
-                "EnterCar": "Enter",
-                "EnterCarAsPassenger": "f"
-            }
+            "LeaveCar": "Enter",
+            "HandBrake": "Space",
+            "Accelerate": "Up",
+            "Reverse": "Down",
+            "SteerLeft": "Left",
+            "SteerRight": "Right",
+            "Horn": "Tab",
+            "TurnLeft": "Left",
+            "TurnRight": "Right",
+            "Jump": "Space",
+            "WalkBackward": "Down",
+            "Run": "Up",
+            "Shoot": "LCtrl",
+            "NextWeapon": "x",
+            "PrevWeapon": "z",
+            "EnterCar": "Enter",
+            "EnterCarAsPassenger": "f"
         },
         "gamepad":
         {
-            "in_car":
-            {
-                "LeaveCar": "X",
-                "HandBrake": "Y",
-                "Accelerate": "Up",
-                "Reverse": "Down",
-                "SteerLeft": "Left",
-                "SteerRight": "Right",
-                "Horn": "A"
-            },
-            "on_foot":
-            {
-                "TurnLeft": "Left",
-                "TurnRight": "Right",
-                "Jump": "LeftTrigger",
-                "WalkBackward": "Down",
-                "Run": "Up",
-                "Shoot": "B",
-                "NextWeapon": "LeftBumper",
-                "PrevWeapon": "RightBumper",
-                "EnterCar": "X",
-                "EnterCarAsPassenger": "A"
-            }
+            "LeaveCar": "X",
+            "HandBrake": "Y",
+            "Accelerate": "Up",
+            "Reverse": "Down",
+            "SteerLeft": "Left",
+            "SteerRight": "Right",
+            "Horn": "A",
+            "TurnLeft": "Left",
+            "TurnRight": "Right",
+            "Jump": "LeftTrigger",
+            "WalkBackward": "Down",
+            "Run": "Up",
+            "Shoot": "B",
+            "NextWeapon": "LeftBumper",
+            "PrevWeapon": "RightBumper",
+            "EnterCar": "X",
+            "EnterCarAsPassenger": "A"
         }
     },
     "player2":

src/CarnageGame.cpp

@@ -145,7 +145,10 @@ void CarnageGame::InputEvent(KeyInputEvent& inputEvent)
         if (inputEvent.mConsumed)
             break;
 
-        currentController.InputEvent(inputEvent);
+        if (currentController.mCharacter)
+        {
+            currentController.InputEvent(inputEvent);
+        }
     }
 }
 
@@ -178,13 +181,16 @@ void CarnageGame::InputEvent(KeyCharEvent& inputEvent)
 }
 
 void CarnageGame::InputEvent(GamepadInputEvent& inputEvent)
-{
-    for (int icurr = 0; icurr < GAME_MAX_PLAYERS; ++icurr)
+{
+    for (HumanCharacterController& currentController: mHumanCharacters)
     {
         if (inputEvent.mConsumed)
             break;
 
-        mHumanCharacters[icurr].InputEvent(inputEvent);
+        if (currentController.mCharacter)
+        {
+            currentController.InputEvent(inputEvent);
+        }
     }
 }