From: otta8634 <k9wolf@pm.me>
Date: Sun, 9 Feb 2025 07:38:32 +0000 (+0800)
Subject: Show Tuba in the keybinds input list
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c77ee9cf42bf572f9f22a8d88c6e19ec96c9da3d;p=xonotic%2Fxonotic-data.pk3dir.git

Show Tuba in the keybinds input list

Previously it wasn't shown, despite having a unique weapon impulse alias (weapon_arc).
---

diff --git a/qcsrc/menu/xonotic/keybinder.qc b/qcsrc/menu/xonotic/keybinder.qc
index d1fad8239..1a44fe245 100644
--- a/qcsrc/menu/xonotic/keybinder.qc
+++ b/qcsrc/menu/xonotic/keybinder.qc
@@ -85,10 +85,9 @@ void KeyBinds_BuildList()
 	KEYBIND_DEF("dropweapon"                            , _("drop weapon / throw nade"));
 
 	#define SHOWABLE_WEAPON(w) \
-		(( !(it.spawnflags & (WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_SUPERWEAPON))) /* normal weapons */ \
-		|| ((it.spawnflags & WEP_FLAG_SUPERWEAPON)    && !(it.spawnflags & WEP_FLAG_HIDDEN)) /* non-hidden superweapons */ \
-		|| ((it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && !(it.spawnflags & WEP_FLAG_HIDDEN)) /* non-hidden mutator weapons */ \
-		)
+		(!(it.spawnflags & WEP_FLAG_SPECIALATTACK) && \
+		!((it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && (it.spawnflags & WEP_FLAG_HIDDEN)) )
+	// no special attacks, and no hidden mutator-blocked weapons
 
 	for (int imp = 1; imp <= 9; ++imp)
 	{