Merge branch 'develop' into remote_reader

2019-05-12 17:07:49 -05:00 · 2019-05-12 17:07:49 -05:00 · c793b10154
parent 860be4a04a 32a0ab9679
commit c793b10154
3 changed files with 4 additions and 4 deletions
--- a/library/lua/gui/dwarfmode.lua
+++ b/library/lua/gui/dwarfmode.lua
@ -226,7 +226,7 @@ MOVEMENT_KEYS = {
    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]
    if info 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
 end

-local function get_hotkey_target(key)
+function get_hotkey_target(key)
    local hk = HOTKEY_KEYS[key]
    if hk and hk.cmd == df.ui_hotkey.T_cmd.Zoom then
        return xyz2pos(hk.x, hk.y, hk.z)
--- a/library/xml
+++ b/library/xml
@ -1 +1 @@
-Subproject commit 44215836d5b57c3722b126aaf481f652385f3a23
+Subproject commit 2be1fc4afea4d3345b9b76d0f27f56087ac9b6e0
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 4b38ccc83b074e87cedddf3941eb144cf45de020
+Subproject commit c8394fa75ff20abcdcdbe975dbf157d21882172e