From 00aaf2bb118b35412656a3c48dee76c878d95797 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sun, 7 Jul 2013 17:21:22 -0700
Subject: [PATCH] Remove right stick bind option entirely.

---
 Core/Config.cpp    |  2 --
 Core/Config.h      |  7 -------
 UI/MenuScreens.cpp | 28 ----------------------------
 3 files changed, 37 deletions(-)

diff --git a/Core/Config.cpp b/Core/Config.cpp
index 2e46aa9ac2..070d3ddb8d 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -145,7 +145,6 @@ void Config::Load(const char *iniFileName)
 	control->Get("LargeControls", &bLargeControls, false);
 	// control->Get("KeyMapping",iMappingMap);
 	control->Get("AccelerometerToAnalogHoriz", &bAccelerometerToAnalogHoriz, false);
-	control->Get("RightStickBind", &iRightStickBind, 0);
 	control->Get("SwapDInputRightAxes", &iSwapRightAxes, 0);
 	control->Get("TouchButtonOpacity", &iTouchButtonOpacity, 65);
 	control->Get("ButtonScale", &fButtonScale, 1.15);
@@ -259,7 +258,6 @@ void Config::Save()
 		control->Set("LargeControls", bLargeControls);
 		// control->Set("KeyMapping",iMappingMap);
 		control->Set("AccelerometerToAnalogHoriz", bAccelerometerToAnalogHoriz);
-		control->Set("RightStickBind", iRightStickBind);
 		control->Set("SwapDInputRightAxes", iSwapRightAxes);
 		control->Set("TouchButtonOpacity", iTouchButtonOpacity);
 		control->Set("ButtonScale", fButtonScale);
diff --git a/Core/Config.h b/Core/Config.h
index 2ca9499203..40db11ade1 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -108,13 +108,6 @@ public:
 	bool bShowDebugStats;
 	bool bLargeControls;
 	bool bAccelerometerToAnalogHoriz;
-	// Temporary until control mapping rewrite
-	// 0 = none
-	// 1 = arrow buttons
-	// 2 = face buttons
-	// 3 = L/R
-	// 4 = L/R + triangle/cross
-	int iRightStickBind;
 	int iSwapRightAxes;
 
 	// Control
diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp
index 1186dda7b0..2ff00e5dd1 100644
--- a/UI/MenuScreens.cpp
+++ b/UI/MenuScreens.cpp
@@ -1491,34 +1491,6 @@ void ControlsScreen::render() {
 	UICheckBox(GEN_ID, x, y += stride, c->T("Tilt", "Tilt to Analog (horizontal)"), ALIGN_TOPLEFT, &g_Config.bAccelerometerToAnalogHoriz);
 	if (g_Config.bShowTouchControls) {
 		UICheckBox(GEN_ID, x, y += stride, c->T("Show Left Analog Stick"), ALIGN_TOPLEFT, &g_Config.bShowAnalogStick);
-		bool rightstick = g_Config.iRightStickBind > 0;
-		UICheckBox(GEN_ID, x, y += stride, c->T("Bind Right Analog Stick"), ALIGN_TOPLEFT, &rightstick);
-		if (rightstick) {
-			if (g_Config.iRightStickBind <= 0 )
-				g_Config.iRightStickBind = 1;
-
-			char showType[256];
-			std::string type;
-			switch (g_Config.iRightStickBind) {
-			case 1:	type = "Arrow Buttons";break;
-			case 2: type = "Face Buttons";break;
-			case 3:	type = "L/R";break;
-			case 4:	type = "L/R + Triangle/Cross";break;
-			}
-			sprintf(showType, "%s %s", c->T("Target :"), type.c_str());
-			ui_draw2d.DrawText(UBUNTU24, showType, x + 60, (y += stride) , 0xFFFFFFFF, ALIGN_LEFT);
-			HLinear hlinear1(x + 60 , y+= stride + 5, 10);
-			if (UIButton(GEN_ID, hlinear1, 200, 0, c->T("Arrow Buttons"), ALIGN_LEFT)) 
-				g_Config.iRightStickBind = 1;
-			if (UIButton(GEN_ID, hlinear1, 200, 0, c->T("Face Buttons"), ALIGN_LEFT))
-				g_Config.iRightStickBind = 2;
-			if (UIButton(GEN_ID, hlinear1, 60, 0, c->T("L/R"), ALIGN_LEFT))
-				g_Config.iRightStickBind = 3;
-			if (UIButton(GEN_ID, hlinear1, 280, 0, c->T("L/R + Triangle/Cross"), ALIGN_LEFT))
-				g_Config.iRightStickBind = 4;
-			y += 20;
-		} else
-			g_Config.iRightStickBind = 0;
 			
 		UICheckBox(GEN_ID, x, y += stride, c->T("Buttons Scaling"), ALIGN_TOPLEFT, &g_Config.bLargeControls);
 		if (g_Config.bLargeControls) {