re-introduced collision detection. still not perfect.

threw some magic numbers in there, and hitting a wall in a hallway
throws you back into the corresponding room, but for the most part it's
satisfactory.
Fixed collision detection in hallways