Only check clicking on NPC when not talking to an NPC

Fixes #1260
Merge pull request #1261 from dorkster/fixes

Only check clicking on NPC when not talking to an NPC