fix warnings in resolve-hits
Merge branch 'master' into sauerbraten