I think for collision detection in entmove.c, one needs to copy the functions and replace the x y z changes with c_move.