X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fkeybinder.qc;h=2d093a2ed5fe23078604a10fdfdbe5606d9a2966;hb=79eebf87e68861e205a8754d6551bd0aa2229c44;hp=3cb20d3018dfaa69b20c0ac3867dd62f98d01992;hpb=d271f27a5ac351a3a7b39636932f6d661492be1d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/keybinder.qc b/qcsrc/menu/xonotic/keybinder.qc
index 3cb20d301..2d093a2ed 100644
--- a/qcsrc/menu/xonotic/keybinder.qc
+++ b/qcsrc/menu/xonotic/keybinder.qc
@@ -1,6 +1,6 @@
 #include "keybinder.qh"
 
-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>
 .int flags;
 
 #include "button.qh"
@@ -41,10 +41,10 @@ void Xonotic_KeyBinds_Read()
 	KEYBIND_DEF("+fire2"                                , _("secondary fire"));
 	KEYBIND_DEF(""                                      , "");
 	KEYBIND_DEF(""                                      , _("Weapon switching"));
-	KEYBIND_DEF("weapprev"                              , _("previous"));
-	KEYBIND_DEF("weapnext"                              , _("next"));
-	KEYBIND_DEF("weaplast"                              , _("previously used"));
-	KEYBIND_DEF("weapbest"                              , _("best"));
+	KEYBIND_DEF("weapprev"                              , CTX(_("WEAPON^previous")));
+	KEYBIND_DEF("weapnext"                              , CTX(_("WEAPON^next")));
+	KEYBIND_DEF("weaplast"                              , CTX(_("WEAPON^previously used")));
+	KEYBIND_DEF("weapbest"                              , CTX(_("WEAPON^best")));
 	KEYBIND_DEF("reload"                                , _("reload"));
 
 	int i;
@@ -59,9 +59,9 @@ void Xonotic_KeyBinds_Read()
 	for(int imp = 1; imp <= 9; ++imp)
 	{
         string w_list = "";
-		ADD_TO_W_LIST(!(it.flags & WEP_FLAG_MUTATORBLOCKED) && !(it.flags & WEP_FLAG_SUPERWEAPON));
-		ADD_TO_W_LIST(it.flags & WEP_FLAG_SUPERWEAPON);
-		ADD_TO_W_LIST(it.flags & WEP_FLAG_MUTATORBLOCKED);
+		ADD_TO_W_LIST(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && !(it.spawnflags & WEP_TYPE_OTHER) && !(it.spawnflags & WEP_FLAG_HIDDEN) && !(it.spawnflags & WEP_FLAG_SUPERWEAPON));
+		ADD_TO_W_LIST((it.spawnflags & WEP_FLAG_SUPERWEAPON) && !(it.spawnflags & WEP_TYPE_OTHER) && !(it.spawnflags & WEP_FLAG_HIDDEN));
+		ADD_TO_W_LIST((it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && !(it.spawnflags & WEP_TYPE_OTHER) && !(it.spawnflags & WEP_FLAG_HIDDEN));
 		if(w_list)
 			KEYBIND_DEF(strcat("weapon_group_", itos(imp)), substring(w_list, 0, -4));
 		if(imp == 0)