Merge branch 'develop' into remote_reader

quarque2 · May 12, 2019 · c793b10 · c793b10
2 parents 860be4a + 32a0ab9
commit c793b10
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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)

diff --git a/library/xml b/library/xml
diff --git a/scripts b/scripts
+35 −25		df.advmode.xml
+176 −42		df.art.xml
+2 −1		df.entities.xml
+13 −13		df.history.xml
+1 −1		df.interaction.xml
+3 −3		df.itemimprovements.xml
+2 −2		df.items.xml
+9 −9		df.legends.xml
+3 −3		df.military.xml
+1 −1		df.plant-raws.xml
+3 −3		df.units.xml
+2 −4		df.viewscreen.xml
+1 −1		df.world-data.xml
+2 −2		df.world.xml
+10 −0		bodyswap.lua
+9 −5		combine-drinks.lua
+3 −3		combine-plants.lua
+386 −0		dorf_tables.lua
+1,122 −0		dwarf-op.lua
+1 −0		gui/autogems.lua
+39 −15		modtools/create-unit.lua
+90 −0		unretire-anyone.lua
+1 −1		view-item-info.lua