Merge branch 'master' into metalstuff

src/dehacked.c

src/g_game.c

src/info.c

src/info.h

src/p_inter.c

src/p_map.c

src/p_mobj.c

src/p_user.c

src/s_sound.c