Merge branch 'floorsprite-fix' into 'next'

src/r_plane.c

src/r_plane.h

src/r_splats.c

src/r_splats.h

src/r_things.c

src/r_things.h