Merge branch SRB2:next into issue1040

src/m_cheat.c

src/m_cheat.h

src/netcode/d_netcmd.c

src/p_setup.c

src/p_setup.h

src/r_segs.c