X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fkeybinder.qc;h=8c0468ea0d639733ad06ed5e56412a702968c546;hp=1c0bf3563c69b8e375fb90e58cd7b21fedeb6d76;hb=d7ecf0b99095f97132ddb1252268ff7d7fb8597b;hpb=7d6db6a932fdfde0f69e8aede503b845904ec71a diff --git a/qcsrc/menu/xonotic/keybinder.qc b/qcsrc/menu/xonotic/keybinder.qc index 1c0bf3563..8c0468ea0 100644 --- a/qcsrc/menu/xonotic/keybinder.qc +++ b/qcsrc/menu/xonotic/keybinder.qc @@ -1,42 +1,10 @@ -#ifndef KEYBINDER_H -#define KEYBINDER_H -#include "listbox.qc" -CLASS(XonoticKeyBinder, XonoticListBox) - METHOD(XonoticKeyBinder, configureXonoticKeyBinder, void(entity)); - ATTRIB(XonoticKeyBinder, rowsPerItem, int, 1) - METHOD(XonoticKeyBinder, drawListBoxItem, void(entity, int, vector, bool, bool)); - METHOD(XonoticKeyBinder, doubleClickListBoxItem, void(entity, float, vector)); - METHOD(XonoticKeyBinder, resizeNotify, void(entity, vector, vector, vector, vector)); - METHOD(XonoticKeyBinder, showNotify, void(entity)); - METHOD(XonoticKeyBinder, setSelected, void(entity, float)); - METHOD(XonoticKeyBinder, keyDown, float(entity, float, float, float)); - METHOD(XonoticKeyBinder, keyGrabbed, void(entity, float, float)); - METHOD(XonoticKeyBinder, destroy, void(entity)); - - ATTRIB(XonoticKeyBinder, realFontSize, vector, '0 0 0') - ATTRIB(XonoticKeyBinder, realUpperMargin, float, 0) - ATTRIB(XonoticKeyBinder, columnFunctionOrigin, float, 0) - ATTRIB(XonoticKeyBinder, columnFunctionSize, float, 0) - ATTRIB(XonoticKeyBinder, columnKeysOrigin, float, 0) - ATTRIB(XonoticKeyBinder, columnKeysSize, float, 0) - - METHOD(XonoticKeyBinder, loadKeyBinds, void(entity)); - ATTRIB(XonoticKeyBinder, previouslySelected, int, -1) - ATTRIB(XonoticKeyBinder, inMouseHandler, float, 0) - ATTRIB(XonoticKeyBinder, userbindEditButton, entity, NULL) - ATTRIB(XonoticKeyBinder, keyGrabButton, entity, NULL) - ATTRIB(XonoticKeyBinder, clearButton, entity, NULL) - ATTRIB(XonoticKeyBinder, userbindEditDialog, entity, NULL) - METHOD(XonoticKeyBinder, editUserbind, void(entity, string, string, string)); -ENDCLASS(XonoticKeyBinder) -entity makeXonoticKeyBinder(); -void KeyBinder_Bind_Change(entity btn, entity me); -void KeyBinder_Bind_Clear(entity btn, entity me); -void KeyBinder_Bind_Edit(entity btn, entity me); -void KeyBinder_Bind_Reset_All(entity btn, entity me); -#endif - -#ifdef IMPLEMENTATION +#include "keybinder.qh" + +#include +.int flags; + +#include "button.qh" +#include "dialog_settings_input_userbind.qh" const string KEY_NOT_BOUND_CMD = "// not bound"; @@ -50,13 +18,13 @@ void Xonotic_KeyBinds_Read() { Xonotic_KeyBinds_Count = 0; - #define KEYBIND_DEF(func, desc) do { \ + #define KEYBIND_DEF(func, desc) MACRO_BEGIN \ if((Xonotic_KeyBinds_Count < MAX_KEYBINDS)) { \ Xonotic_KeyBinds_Functions[Xonotic_KeyBinds_Count] = strzone(func); \ Xonotic_KeyBinds_Descriptions[Xonotic_KeyBinds_Count] = strzone(desc); \ ++Xonotic_KeyBinds_Count; \ } \ - } while(0) + MACRO_END KEYBIND_DEF("" , _("Moving")); KEYBIND_DEF("+forward" , _("forward")); @@ -66,41 +34,37 @@ 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")); 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("" , _("Weapons")); + 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")); + KEYBIND_DEF("dropweapon" , _("drop weapon / throw nade")); int i; - #define ADD_TO_W_LIST(pred) do { \ - for(i = WEP_FIRST; i <= WEP_LAST; ++i) \ - { \ - wep = get_weaponinfo(i); \ - if(wep.impulse == imp && (pred)) \ - w_list = strcat(w_list, WEP_NAME(i), " / "); \ - } \ - } while(0) + #define ADD_TO_W_LIST(pred) \ + FOREACH(Weapons, it != WEP_Null, { \ + if (it.impulse != imp) continue; \ + if (!(pred)) continue; \ + w_list = strcat(w_list, it.m_name, " / "); \ + }) - int imp; - entity wep; - string w_list = ""; - for(imp = 1; imp <= 9; ++imp) + for(int imp = 1; imp <= 9; ++imp) { - ADD_TO_W_LIST(!(wep.flags & WEP_FLAG_MUTATORBLOCKED) && !(wep.flags & WEP_FLAG_SUPERWEAPON)); - ADD_TO_W_LIST(wep.flags & WEP_FLAG_SUPERWEAPON); - ADD_TO_W_LIST(wep.flags & WEP_FLAG_MUTATORBLOCKED); + string w_list = ""; + ADD_TO_W_LIST(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && !(it.spawnflags & WEP_FLAG_HIDDEN) && !(it.spawnflags & WEP_FLAG_SUPERWEAPON)); + ADD_TO_W_LIST((it.spawnflags & WEP_FLAG_SUPERWEAPON) && !(it.spawnflags & WEP_FLAG_HIDDEN)); + ADD_TO_W_LIST((it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && !(it.spawnflags & WEP_FLAG_HIDDEN)); if(w_list) KEYBIND_DEF(strcat("weapon_group_", itos(imp)), substring(w_list, 0, -4)); - w_list = ""; if(imp == 0) break; if(imp == 9) @@ -115,6 +79,8 @@ void Xonotic_KeyBinds_Read() KEYBIND_DEF("+showscores" , _("show scores")); KEYBIND_DEF("screenshot" , _("screen shot")); KEYBIND_DEF("+hud_panel_radar_maximized" , _("maximize radar")); + KEYBIND_DEF("toggle chase_active" , _("3rd person view")); + KEYBIND_DEF("spec" , _("enter spectator mode")); KEYBIND_DEF("" , ""); KEYBIND_DEF("" , _("Communicate")); KEYBIND_DEF("messagemode" , _("public chat")); @@ -134,12 +100,13 @@ void Xonotic_KeyBinds_Read() KEYBIND_DEF("messagemode2" , _("team chat")); KEYBIND_DEF("team_auto" , _("auto-join team")); KEYBIND_DEF("menu_showteamselect" , _("team menu")); - KEYBIND_DEF("menu_showsandboxtools" , _("sandbox menu")); - KEYBIND_DEF("spec" , _("enter spectator mode")); - KEYBIND_DEF("dropweapon" , _("drop weapon")); KEYBIND_DEF("+use" , _("drop key / drop flag")); + KEYBIND_DEF("" , ""); + KEYBIND_DEF("" , _("Misc")); + KEYBIND_DEF("kill" , _("respawn")); + KEYBIND_DEF("quickmenu" , _("quick menu")); + KEYBIND_DEF("menu_showsandboxtools" , _("sandbox menu")); KEYBIND_DEF("+button8" , _("drag object")); - KEYBIND_DEF("toggle chase_active" , _("3rd person view")); KEYBIND_DEF("" , ""); KEYBIND_DEF("" , _("User defined")); @@ -280,12 +247,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; } @@ -482,4 +445,3 @@ void XonoticKeyBinder_drawListBoxItem(entity me, int i, vector absSize, bool isS draw_CenterText(me.realUpperMargin * eY + (me.columnKeysOrigin + 0.5 * me.columnKeysSize) * eX, s, me.realFontSize, theColor, theAlpha, 0); } } -#endif