Infantry range fix

This fixes #2417 by converting a few more things to world coords and tidies up some formatting along the way.