Index: Build/Tactical/LOS.cc
===================================================================
--- Build/Tactical/LOS.cc	(revision 7063)
+++ Build/Tactical/LOS.cc	(working copy)
@@ -3221,8 +3221,48 @@
 		// increment shots fired if shooter has a merc profile
 	  if( ( pFirer->ubProfile != NO_PROFILE ) && ( pFirer->bTeam == 0 ) )
 		{
-		  // another shot fired
-		  gMercProfiles[ pFirer->ubProfile ].usShotsFired++;
+			bool shot_ack = true; 
+			
+			/* mgl: Cleaning a bloody throwing knife is not firing.
+			 * mgl: Don't count that as a (missed) shot.
+			 */
+			if (pFirer->usAttackingWeapon == BLOODY_THROWING_KNIFE
+			    && pFirer->target == NULL // targets no-one
+			    && pFirer->bTargetLevel <= pFirer->bLevel
+			                              // altitude >= tgt
+			   )
+			{
+				/* There is a chance that the merc is cleaning
+				 * a bloody throwing knife. Loop the
+				 * structures on the target gridno to check.
+				 */ 
+				STRUCTURE const *s = gpWorldLevelData[pFirer->sTargetGridNo].pStructureHead;
+				shot_ack = false;
+				while (s)
+				{
+					if (s->fFlags & STRUCTURE_OBSTACLE)
+					{
+						shot_ack = true;
+						break;
+					}
+					else
+					{
+						s = s->pNext;
+					}
+				}	
+
+				if (!shot_ack)
+				{
+					ScreenMsg(FONT_MCOLOR_LTYELLOW,
+					          MSG_INTERFACE,
+					          L"%ls cleans a %ls.",
+					          pFirer->name,
+					          ShortItemNames[pFirer->usAttackingWeapon]
+					         );
+				}
+			}
+			// another shot fired
+			shot_ack && ++gMercProfiles[pFirer->ubProfile].usShotsFired;
 		}
 
 		if ( Item[ pFirer->usAttackingWeapon ].usItemClass == IC_THROWING_KNIFE )