Fix male assassins and opfor grunts dropping weapons again (#372)

dlls/gearbox/fgrunt.cpp

@@ -1846,6 +1846,7 @@ void CHFGrunt :: HandleAnimEvent( MonsterEvent_t *pEvent )
 	{
 		case HGRUNT_ALLY_AE_DROP_GUN:
 		{
+			if (GetBodygroup(FG_GUN_GROUP) != FG_GUN_NONE)
 				DropMyItems(FALSE);
 			SetUse( NULL );
 		}
@@ -3240,7 +3241,7 @@ void CTorch::HandleAnimEvent(MonsterEvent_t *pEvent)
 		KillGas ();
 		break;
 	case HGRUNT_ALLY_AE_DROP_GUN:
-		if ( FBitSet( pev->weapons, TORCH_EAGLE ) )
+		if ( FBitSet( pev->weapons, TORCH_EAGLE ) && pev->body != TORCH_GUN_NONE )
 		{
 			DropMyItems(FALSE);
 		}
@@ -3771,7 +3772,7 @@ void CMedic::HandleAnimEvent(MonsterEvent_t *pEvent)
 		break;
 
 	case HGRUNT_ALLY_AE_DROP_GUN:
-		if ( FBitSet( pev->weapons, MEDIC_EAGLE | MEDIC_HANDGUN ) )
+		if ( FBitSet( pev->weapons, MEDIC_EAGLE | MEDIC_HANDGUN ) && GetBodygroup(MEDIC_GUN_GROUP) != MEDIC_GUN_NONE )
 		{
 			DropMyItems(FALSE);
 		}

dlls/gearbox/massn.cpp

@@ -155,6 +155,8 @@ void CMassn::HandleAnimEvent(MonsterEvent_t *pEvent)
 		Vector	vecGunPos;
 		Vector	vecGunAngles;
 
+		if(GetBodygroup(GUN_GROUP) != GUN_NONE)
+		{
 			GetAttachment(0, vecGunPos, vecGunAngles);
 
 			// switch to body group with no gun.
@@ -174,7 +176,7 @@ void CMassn::HandleAnimEvent(MonsterEvent_t *pEvent)
 			{
 				DropItem("ammo_ARgrenades", BodyTarget(pev->origin), vecGunAngles);
 			}
-
+		}
 	}
 	break;