From 3852e2655878c2810225dabada954e73b692c4d4 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sun, 7 Jul 2013 10:25:33 -0700
Subject: [PATCH] Remove the force device setting, map instead.

---
 Core/Config.cpp          | 2 --
 Core/Config.h            | 1 -
 Windows/DinputDevice.cpp | 1 -
 Windows/XinputDevice.cpp | 1 -
 4 files changed, 5 deletions(-)

diff --git a/Core/Config.cpp b/Core/Config.cpp
index aebb7523cd..ee8ff6d587 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -144,7 +144,6 @@ void Config::Load(const char *iniFileName)
 	control->Get("LargeControls", &bLargeControls, false);
 	// control->Get("KeyMapping",iMappingMap);
 	control->Get("AccelerometerToAnalogHoriz", &bAccelerometerToAnalogHoriz, false);
-	control->Get("ForceInputDevice", &iForceInputDevice, -1);
 	control->Get("RightStickBind", &iRightStickBind, 0);
 	control->Get("SwapDInputRightAxes", &iSwapRightAxes, 0);
 	control->Get("TouchButtonOpacity", &iTouchButtonOpacity, 65);
@@ -258,7 +257,6 @@ void Config::Save()
 		control->Set("LargeControls", bLargeControls);
 		// control->Set("KeyMapping",iMappingMap);
 		control->Set("AccelerometerToAnalogHoriz", bAccelerometerToAnalogHoriz);
-		control->Set("ForceInputDevice", iForceInputDevice);
 		control->Set("RightStickBind", iRightStickBind);
 		control->Set("SwapDInputRightAxes", iSwapRightAxes);
 		control->Set("TouchButtonOpacity", iTouchButtonOpacity);
diff --git a/Core/Config.h b/Core/Config.h
index 68ec133ed2..3e0010b997 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -117,7 +117,6 @@ public:
 	int iSwapRightAxes;
 
 	// Control
-	int iForceInputDevice;
 	int iTouchButtonOpacity;
 	float fButtonScale;
 
diff --git a/Windows/DinputDevice.cpp b/Windows/DinputDevice.cpp
index 86ebdfff90..b2940155df 100644
--- a/Windows/DinputDevice.cpp
+++ b/Windows/DinputDevice.cpp
@@ -149,7 +149,6 @@ DinputDevice::~DinputDevice() {
 }
 
 int DinputDevice::UpdateState(InputState &input_state) {
-	if (g_Config.iForceInputDevice == 0) return -1;
 	if (!pJoystick) return -1;
 
 	DIJOYSTATE2 js;
diff --git a/Windows/XinputDevice.cpp b/Windows/XinputDevice.cpp
index 528a562410..47d2435217 100644
--- a/Windows/XinputDevice.cpp
+++ b/Windows/XinputDevice.cpp
@@ -46,7 +46,6 @@ struct Stick {
 static Stick NormalizedDeadzoneFilter(short x, short y);
 
 int XinputDevice::UpdateState(InputState &input_state) {
-	if (g_Config.iForceInputDevice > 0) return -1;
 	if (this->check_delay-- > 0) return -1;
 	XINPUT_STATE state;
 	ZeroMemory( &state, sizeof(XINPUT_STATE) );