Revert gamepad analog accel/brake back to face buttons (#19)

PR #17 bundled a gamepad change alongside the touch controls: it enabled
analog stick-Y throttle for every joystick (the original only did so for the
SideWinder Force Feedback Pro whitelist), which put accelerate/brake on the
same thumbstick as steering. On a kart racer that couples the two — the
stick's circular gate means you cannot floor the throttle and steer fully at
the same time — so restore accelerate/brake to face buttons.

Reverts the four analog-throttle chunks from #17:
- PlayerControls::DetectAnalogDevice no longer force-enables analog throttle
  for any joystick (SideWinder whitelist only, as before).
- PlayerControls::UpdateThrottle reads the throttle axis from the throttle
  slot again, not the steer slot.
- ControlConfigScreen no longer greys out or axis-labels the accel/brake rows
  for gamepads, so they are bindable buttons again.

All four functions now byte-match the decomp. Touch controls are unaffected
(separate hooks in the same files). The versus stick-throttle fix (442792a)
is subsumed: that bug only existed because of the analog-for-all-gamepads
behavior being removed here.

Author: foxtacles

LEGORacers/src/menu/screens/controlconfigscreen.cpp

@@ -256,13 +256,6 @@ void ControlConfigScreen::RefreshEventTexts()
 		if (!(m_eventButtons[i].GetStateFlags() & MenuIcon::c_flagFocused)) {
 			LegoU32 event = state.GetInputEvent(m_playerIndex, m_bindingIndices[m_selectedDevice], i);
 
-			// [library:input] Joystick accelerate/brake are analog (stick Y, see
-			// PlayerControls::DetectAnalogDevice) like the steering pair: show the
-			// axis name even over a leftover button binding.
-			if (i >= 2 && i < 4 && m_devices[m_selectedDevice]->GetDeviceType() == 4) {
-				event = 0;
-			}
-
 			if (event) {
 				InputDevice* device;
 				if ((event & InputDevice::c_sourceMask) == InputDevice::c_sourceKeyboard) {
@@ -285,18 +278,6 @@ void ControlConfigScreen::RefreshEventTexts()
 					m_eventTexts[i].ToUpperCase();
 				}
 			}
-			// [library:input] Accelerate/brake rows: the stick's Y axis (axis-button
-			// event 2) drives them on gamepads.
-			else if (i < 4) {
-				InputDevice* device = m_devices[m_selectedDevice];
-				if (device->GetDeviceType() == 4 && (device->GetAxisMask() & 2)) {
-					m_eventTexts[i].CopyFromBufSelection(
-						(undefined2*) device->GetControlName(InputDevice::c_sourceJoystickAxisButton + 2),
-						0
-					);
-					m_eventTexts[i].ToUpperCase();
-				}
-			}
 		}
 
 		m_eventButtons[i].SetText(&m_eventTexts[i]);
@@ -311,17 +292,10 @@ LegoBool32 ControlConfigScreen::Update(undefined4 p_source)
 	if (m_devices[m_selectedDevice]->GetDeviceType() == 3) {
 		m_eventButtons[0].Enable(0);
 		m_eventButtons[1].Enable(0);
-		m_eventButtons[2].Enable(0);
-		m_eventButtons[3].Enable(0);
 	}
 	else {
 		m_eventButtons[0].Disable(0);
 		m_eventButtons[1].Disable(0);
-		// [library:input] Accelerate/brake ride the stick's Y axis on gamepads (see
-		// PlayerControls::DetectAnalogDevice), matching how steering rides X — grey
-		// their rows out like the steering pair.
-		m_eventButtons[2].Disable(0);
-		m_eventButtons[3].Disable(0);
 	}
 
 	return MenuGameScreen::Update(p_source);

LEGORacers/src/race/playercontrols.cpp

@@ -236,12 +236,7 @@ void PlayerControls::UpdateThrottle()
 	LegoFloat reverseValue = 0.0f;
 	DirectInputDevice* source;
 
-	// [library:input] Read the throttle axis from the steer slot's device (always the
-	// gamepad on a joystick binding), not the throttle slot's: rebinding a button that
-	// collides with the hidden accel/brake defaults makes the game refill slot 2 with a
-	// keyboard event (entry 0) or nothing, and the original slot-2 read would then poll
-	// an axis-less device and stick throttle would silently die.
-	m_input.GetBinding(&source, 0);
+	m_input.GetBinding(&source, 2);
 	if (m_input.m_analogThrottle) {
 		LegoFloat analogValue = -source->GetAxisValue(2);
 		if (analogValue < 0.0f) {
@@ -534,20 +529,6 @@ LegoS32 PlayerControls::DetectAnalogDevice()
 		m_input.m_analogThrottle = TRUE;
 	}
 
-	// [library:input] The original only trusted its SideWinder whitelist with an
-	// analog Y axis; every SDL gamepad has one. Enable analog throttle (stick
-	// forward/back in UpdateThrottle) whenever the steer slot reads a joystick, so
-	// one thumbstick drives steering and speed together. The steer slot is the
-	// anchor because the throttle slot's device is not stable: rebinding a button
-	// that collides with the hidden accel/brake defaults refills slot 2 with a
-	// keyboard event (entry 0's fallback) or clears it, which must not turn the
-	// stick throttle off.
-	DirectInputDevice* throttleSource;
-	m_input.GetBinding(&throttleSource, 0);
-	if (throttleSource && throttleSource->GetDeviceType() == 4) {
-		m_input.m_analogThrottle = TRUE;
-	}
-
 	return result;
 }