Sounds like assault with a deadly weapon, and if he took it out to show, then it's brandishing. It doesn't matter if it was non-firming because the target didn't know that, and typically these laws are written to be what "a reasonable person would believe".
Also, at the time this happened he was a known user of Marijuana and thus not eligible to own a firearm, as that rule had not yet been struck down.