Index: Unit.cpp
===================================================================
--- Unit.cpp	(revision 3321)
+++ Unit.cpp	(working copy)
@@ -941,23 +941,31 @@
 	return true;
 }
 
+
 bool CUnit::AttackUnit(CUnit *unit,bool dgun)
 {
-	bool r=false;
-	haveDGunRequest=dgun;
-	userAttackGround=false;
-	commandShotCount=0;
+	bool r = false;
+	haveDGunRequest = dgun;
+	userAttackGround = false;
+	commandShotCount = 0;
 	SetUserTarget(unit);
+
 	std::vector<CWeapon*>::iterator wi;
-	for(wi=weapons.begin();wi!=weapons.end();++wi){
-		(*wi)->haveUserTarget=false;
-		if(dgun || !unitDef->canDGun || !(*wi)->weaponDef->manualfire)
-			if((*wi)->AttackUnit(unit,true))
-				r=true;
+	for (wi = weapons.begin(); wi != weapons.end(); ++wi) {
+		// set weapon targetType to none in case we exited
+		// first-person mode while targetting something
+		(*wi)->haveUserTarget = false;
+		(*wi)->targetType = Target_None;
+
+		if (dgun || !unitDef->canDGun || !(*wi)->weaponDef->manualfire)
+			if ((*wi)->AttackUnit(unit, true))
+				r = true;
 	}
+
 	return r;
 }
 
+
 bool CUnit::AttackGround(const float3 &pos, bool dgun)
 {
 	bool r=false;