Renames some things (#22925)

This commit is contained in:
AffectedArc07
2023-10-16 22:49:31 +01:00
committed by GitHub
parent 973542bc1d
commit be43ccf07f
7 changed files with 43 additions and 41 deletions
+9 -7
View File
@@ -22,8 +22,8 @@
if(!default_macro_sets) //If you ever remove legacy input mode, you can simplify this a lot
default_macro_sets = list(
"default" = list(
"Any" = "\"KeyDown \[\[*\]\]\"", // Passes any key down to the rebindable input system
"Any+UP" = "\"KeyUp \[\[*\]\]\"", // Passes any key up to the rebindable input system
"Any" = "\"Key_Down \[\[*\]\]\"", // Passes any key down to the rebindable input system
"Any+UP" = "\"Key_Up \[\[*\]\]\"", // Passes any key up to the rebindable input system
"Tab" = "\".winset \\\"mainwindow.macro=legacy input.focus=true input.background-color=[COLOR_INPUT_ENABLED]\\\"\"", // Swaps us to legacy mode, forces input to the input bar, sets the input bar colour to salmon pink
"Back" = "\".winset \\\"input.focus=true ? input.text=\\\"\"" // This makes it so backspace can remove default inputs
),
@@ -47,8 +47,8 @@
// We use the static list to make only the keys in it passed to legacy mode
for(var/i in 1 to length(legacy_keys))
var/key = legacy_keys[i]
legacy_default[key] = "\"KeyDown [key]\""
legacy_default["[key]+UP"] = "\"KeyUp [key]\""
legacy_default[key] = "\"Key_Down [key]\""
legacy_default["[key]+UP"] = "\"Key_Up [key]\""
macro_sets = default_macro_sets
@@ -66,7 +66,8 @@
winset(src, null, "input.background-color=[COLOR_INPUT_DISABLED]") //screw you, we start in hotkey mode now
macro_sets = null //not needed anymore, bye have a great time
/client/verb/KeyDown(_key as text)
/client/verb/Key_Down(_key as text)
set name = "Key_Down"
set instant = TRUE
set hidden = TRUE
@@ -135,7 +136,8 @@
mob.input_focus?.key_down(_key, src)
/client/verb/KeyUp(_key as text)
/client/verb/Key_Up(_key as text)
set name = "Key_Up"
set instant = TRUE
set hidden = TRUE
@@ -143,7 +145,7 @@
var/key_combo = ID.key_combos_held[_key]
if(key_combo)
ID.key_combos_held -= _key
KeyUp(key_combo)
Key_Up(key_combo)
ID.keys_held -= _key