diff -r 0db298524c3d -r 33ee433749ba hedgewars/PascalExports.pas
--- a/hedgewars/PascalExports.pas	Sun Jul 11 03:23:26 2010 +0200
+++ b/hedgewars/PascalExports.pas	Sun Jul 11 18:39:01 2010 +0200
@@ -197,14 +197,7 @@
 
 function HW_isWeaponRequiringClick: boolean; cdecl; export;
 begin
-    exit( (savedAmmoType = amTeleport) or
-          (savedAmmoType = amBee) or
-          (savedAmmoType = amAirAttack) or
-          (savedAmmoType = amMineStrike) or
-          (savedAmmoType = amGirder) or
-          (savedAmmoType = amNapalm) or
-          (savedAmmoType = amPiano)
-        )
+    exit( (CurrentHedgehog^.Gear^.State and gstHHChooseTarget) <> 0 )
 end;
 
 //amSwitch