Merge remote-tracking branch 'putnam/patch-3'

develop
expwnent 2014-09-16 16:55:48 -04:00
commit 39bfe71453
1 changed files with 5 additions and 1 deletions

@ -214,7 +214,11 @@ eventful=require('plugins.eventful')
if not args.startup then if not args.startup then
local unit=args.unit and df.unit.find(args.unit) or dfhack.gui.getSelectedUnit(true) local unit=args.unit and df.unit.find(args.unit) or dfhack.gui.getSelectedUnit(true)
hackWish(unit) if unit then
hackWish(unit)
else
qerror('A unit needs to be selected to use hackwish.')
end
else else
eventful.onReactionComplete.hackWishP=function(reaction,unit,input_items,input_reagents,output_items,call_native) eventful.onReactionComplete.hackWishP=function(reaction,unit,input_items,input_reagents,output_items,call_native)
if not reaction.code:find('DFHACK_WISH') then return nil end if not reaction.code:find('DFHACK_WISH') then return nil end