Made the previous fix look decent and more

Fixed the previous fix so it wasn't nearly as hideous as it was
before. Additionally, renamed the constants so the naming was consistent
and disabled NPC-NPC collisions during pathfinding. Should do something
a bit more proper in that situation (maybe have one of the NPCs re-do
their pathfind?)

If I don't get sidetracked by making the awful NPC collisions look
better, next up is some more PlanEntries!

I'll be leaving the FoV off for now while I develop everything else,
until its necessary to turn it back on.