Fixed a score bug

Multiple simultaneus bullet hits, like from the shotgun, resulted in
multiple score updates.
Merge branch 'master' into specialeffects-ernir