Merge branch 'next' into public_next

src/hardware/hw_main.c

src/m_cheat.c

src/p_user.c

src/r_main.c