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

Merge remote-tracking branch 'dfhack/develop' into develop

develop
expwnent 2015-01-15 22:54:42 -05:00
parent edefeb8ae0 a78d4cc5f0
commit a962865b7f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/gui/advfort.lua
Unescape Escape View File

@ -1,8 +1,10 @@
-- allows to do jobs in adv. mode. -- allows to do jobs in adv. mode.
--[==[ --[==[
version: 0.011 version: 0.012
changelog: changelog:
*0.012
- fix for some jobs not finding correct building.
*0.011 *0.011
- fixed crash with building jobs (other jobs might have been crashing too!) - fixed crash with building jobs (other jobs might have been crashing too!)
- fixed bug with building asking twice to input items - fixed bug with building asking twice to input items
@ -1123,7 +1125,7 @@ function usetool:openShopWindow(building)
local filter_pile=workshopJobs.getJobs(building:getType(),building:getSubtype(),building:getCustomType()) local filter_pile=workshopJobs.getJobs(building:getType(),building:getSubtype(),building:getCustomType())
if filter_pile then if filter_pile then
local state={unit=adv,from_pos={x=adv.pos.x,y=adv.pos.y, z=adv.pos.z,building=building} local state={unit=adv,from_pos={x=adv.pos.x,y=adv.pos.y, z=adv.pos.z},building=building
,screen=self,bld=building,common=filter_pile.common} ,screen=self,bld=building,common=filter_pile.common}
choices={} choices={}
for k,v in pairs(filter_pile) do for k,v in pairs(filter_pile) do
@ -1455,4 +1457,4 @@ end
if not (dfhack.gui.getCurFocus()=="dungeonmode/Look" or dfhack.gui.getCurFocus()=="dungeonmode/Default") then if not (dfhack.gui.getCurFocus()=="dungeonmode/Look" or dfhack.gui.getCurFocus()=="dungeonmode/Default") then
qerror("This script requires an adventurer mode with (l)ook or default mode.") qerror("This script requires an adventurer mode with (l)ook or default mode.")
end end
usetool():show() usetool():show()