MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into remote_reader

develop
JapaMala 2019-05-12 17:07:49 -05:00
parent 860be4a04a 32a0ab9679
commit c793b10154
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/lua/gui/dwarfmode.lua
Unescape Escape View File

@ -226,7 +226,7 @@ MOVEMENT_KEYS = {
CURSOR_UP_Z_AUX = { 0, 0, 1 }, CURSOR_DOWN_Z_AUX = { 0, 0, -1 }, CURSOR_UP_Z_AUX = { 0, 0, 1 }, CURSOR_DOWN_Z_AUX = { 0, 0, -1 },
} }
local function get_movement_delta(key, delta, big_step) function get_movement_delta(key, delta, big_step)
local info = MOVEMENT_KEYS[key] local info = MOVEMENT_KEYS[key]
if info then if info then
if info[4] then if info[4] then
@ -243,7 +243,7 @@ for i,v in ipairs(df.global.ui.main.hotkeys) do
HOTKEY_KEYS['D_HOTKEY'..(i+1)] = v HOTKEY_KEYS['D_HOTKEY'..(i+1)] = v
end end
local function get_hotkey_target(key) function get_hotkey_target(key)
local hk = HOTKEY_KEYS[key] local hk = HOTKEY_KEYS[key]
if hk and hk.cmd == df.ui_hotkey.T_cmd.Zoom then if hk and hk.cmd == df.ui_hotkey.T_cmd.Zoom then
return xyz2pos(hk.x, hk.y, hk.z) return xyz2pos(hk.x, hk.y, hk.z)

2
library/xml

@ -1 +1 @@
Subproject commit 44215836d5b57c3722b126aaf481f652385f3a23 Subproject commit 2be1fc4afea4d3345b9b76d0f27f56087ac9b6e0

2
scripts

@ -1 +1 @@
Subproject commit 4b38ccc83b074e87cedddf3941eb144cf45de020 Subproject commit c8394fa75ff20abcdcdbe975dbf157d21882172e