X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fkeybinder.qc;h=a14406bcec7202aa518df979bcb29f619f5c90a3;hb=7e5268799e95d0dd6f2b77ed4e097b0adc755f2b;hp=c53ec7efe1144e85a448607f265c032ff5ae52e5;hpb=111e272282e9e4239ad7ec7cb6784f769f9eaf23;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/keybinder.qc b/qcsrc/menu/xonotic/keybinder.qc
index c53ec7efe..a14406bce 100644
--- a/qcsrc/menu/xonotic/keybinder.qc
+++ b/qcsrc/menu/xonotic/keybinder.qc
@@ -34,7 +34,7 @@ void Xonotic_KeyBinds_Read()
 	KEYBIND_DEF("+jump"                                 , _("jump / swim"));
 	KEYBIND_DEF("+crouch"                               , _("crouch / sink"));
 	KEYBIND_DEF("+hook"                                 , _("off-hand hook"));
-	KEYBIND_DEF("+jetpack"                              , _("jet pack"));
+	KEYBIND_DEF("+jetpack"                              , _("jetpack"));
 	KEYBIND_DEF(""                                      , "");
 	KEYBIND_DEF(""                                      , _("Attacking"));
 	KEYBIND_DEF("+fire"                                 , _("primary fire"));
@@ -51,11 +51,11 @@ void Xonotic_KeyBinds_Read()
 	int i;
 
 	#define ADD_TO_W_LIST(pred) \
-		FOREACH(Weapons, it != WEP_Null, LAMBDA( \
+		FOREACH(Weapons, it != WEP_Null, { \
 			if (it.impulse != imp) continue; \
 			if (!(pred)) continue; \
 			w_list = strcat(w_list, it.m_name, " / "); \
-		))
+		})
 
 	for(int imp = 1; imp <= 9; ++imp)
 	{
@@ -103,6 +103,7 @@ void Xonotic_KeyBinds_Read()
 	KEYBIND_DEF("+use"                                  , _("drop key / drop flag"));
 	KEYBIND_DEF(""                                      , "");
 	KEYBIND_DEF(""                                      , _("Misc"));
+	KEYBIND_DEF("quickmenu"                             , _("quick menu"));
 	KEYBIND_DEF("menu_showsandboxtools"                 , _("sandbox menu"));
 	KEYBIND_DEF("+button8"                              , _("drag object"));
 	KEYBIND_DEF(""                                      , "");
@@ -245,12 +246,8 @@ void XonoticKeyBinder_destroy(entity me)
 
 	for(int i = 0; i < MAX_KEYBINDS; ++i)
 	{
-		if(Xonotic_KeyBinds_Functions[i])
-			strunzone(Xonotic_KeyBinds_Functions[i]);
-		Xonotic_KeyBinds_Functions[i] = string_null;
-		if(Xonotic_KeyBinds_Descriptions[i])
-			strunzone(Xonotic_KeyBinds_Descriptions[i]);
-		Xonotic_KeyBinds_Descriptions[i] = string_null;
+		strfree(Xonotic_KeyBinds_Functions[i]);
+		strfree(Xonotic_KeyBinds_Descriptions[i]);
 	}
 	Xonotic_KeyBinds_Count = 0;
 }