Index: gearhead-1.100/pcaction.pp
===================================================================
--- gearhead-1.100.orig/pcaction.pp	2010-02-10 21:40:34.000000000 +0200
+++ gearhead-1.100/pcaction.pp	2010-02-10 21:54:12.000000000 +0200
@@ -2099,6 +2099,7 @@
 var
 	WPM: RPGMenuPtr;
 	N,AtOp: Integer;
+	WeaponTmp: GearPtr;
 begin
 	if not ReadyToFire( GB , Mek , Weapon ) then begin
 		DialogMsg( ReplaceHash( MsgString( 'ATA_NotReady' ) , GearName( Weapon ) ) );
@@ -2106,7 +2107,8 @@
 	end;
 
 	AtOp := DefaultAtOp( Weapon );
-	if SelectTarget( GB , Mek , Weapon , CallShot , AtOp ) then begin
+	WeaponTmp := Weapon;
+	if SelectTarget( GB , Mek , WeaponTmp , CallShot , AtOp ) then begin
 		{ Check to make sure the target is within maximum range, }
 		{ and that it falls within the correct arc. }
 		AtOp := DefaultAtOp( Weapon );
