Merge pull request #1261 from dorkster/fixes

Only check clicking on NPC when not talking to an NPC
Fix regression in 80fbe3f (NPC hover bug)

Closes #1260

It's simpler to check if any of the NPC-related menus are open.