Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into toast_slopes

src/p_floor.c

src/p_map.c

src/p_mobj.c

src/p_spec.c

src/p_user.c

src/r_defs.h