From fa35d00ba8d394105f4db81ed6c0c7d4cd16aa7e Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Sat, 2 Aug 2025 22:47:42 -0400
Subject: [PATCH] Remove default binds for DirectInput

As requested.

DirectInput-only controllers are already getting rarer and rarer. Plus, this branch makes all controllers faster & simpler to rebind. I'd even argue these get in the way, because you can't just immediately bind a DInput controller from boot-up, you have to unbind everything first.

I'm not against a new code path for DInput defaults that tries to guess what kind of controller you have, but I don't care about it myself.
---
 wadsrc/static/engine/commonbinds.txt | 29 ----------------------------
 wadsrc/static/engine/origbinds.txt   |  6 ------
 2 files changed, 35 deletions(-)

diff --git a/wadsrc/static/engine/commonbinds.txt b/wadsrc/static/engine/commonbinds.txt
index d1c62ec5f..346c0bdc8 100644
--- a/wadsrc/static/engine/commonbinds.txt
+++ b/wadsrc/static/engine/commonbinds.txt
@@ -73,25 +73,6 @@ rstickright +right
 rstickup +lookup
 rstickdown +lookdown
 
-// Generic gamepad bindings
-joy1 +use
-joy4 +jump
-axis6plus +attack
-axis3plus +altattack
-joy5 weapprev
-joy6 weapnext
-pov1left invprev
-pov1right invnext
-pov1down invuse
-pov1up togglemap
-joy8 menu_main
-joy7 pause
-joy10 crouch
-axis1minus +moveleft
-axis1plus +moveright
-axis2minus +forward
-axis2plus +back
-
 /* Default automap bindings */
 mapbind f am_togglefollow
 mapbind g am_togglegrid
@@ -120,13 +101,3 @@ mapbind dpadup +am_panup
 mapbind dpaddown +am_pandown
 mapbind lshoulder +am_zoomout
 mapbind rshoulder +am_zoomin
-
-mapbind joy3 am_togglefollow
-mapbind joy1 am_setmark
-mapbind joy2 am_clearmarks
-mapbind pov1right +am_panright
-mapbind pov1left +am_panleft
-mapbind pov1up +am_panup
-mapbind pov1down +am_pandown
-mapbind joy5 +am_zoomout
-mapbind joy6 +am_zoomin
diff --git a/wadsrc/static/engine/origbinds.txt b/wadsrc/static/engine/origbinds.txt
index 02326c7c0..90fd7ea4d 100644
--- a/wadsrc/static/engine/origbinds.txt
+++ b/wadsrc/static/engine/origbinds.txt
@@ -12,9 +12,3 @@ space +use
 mouse2 +strafe
 mouse3 +forward
 mouse4 +speed
-
-// Generic joystick buttons
-joy1 +attack
-joy2 +strafe
-joy3 +speed
-joy4 +use