util.finalize

game/engines/default/engine/utils.lua

@@ -2202,6 +2202,16 @@ function util.getval(val, ...)
 	end
 end
 
+function util.finalize(init, uninit, fct)
+	return function(...)
+		local myenv = {}
+		init(myenv, ...)
+		local rets = {fct(myenv, ...)}
+		uninit(myenv, ...)
+		return unpack(rets)
+	end
+end
+
 function fs.reset()
 	local list = fs.getSearchPath(true)
 	for i, m in ipairs(list) do

game/modules/tome/class/interface/Archery.lua

@@ -282,7 +282,7 @@ function _M:archeryAcquireTargets(tg, params, force)
 		local speed = self:combatSpeed(weaponC or pf_weaponC, params.add_speed or 0)
 		print("[SHOOT] speed", speed or 1, "=>", game.energy_to_act * (speed or 1))
 		if not params.no_energy then self:useEnergy(game.energy_to_act * (speed or 1)) end
-		if sound then game:playSoundNear(self, sound) end
+		if not params.no_sound and sound then game:playSoundNear(self, sound) end
 		return targets
 	else
 		return nil