Also fix spawn entry per1 and per2.
Fix a grab-into-wall bug.
Authored by: utunnels 2011-09-26
Parent: [r3474]
Child: [r3476]