Merge branch 'next' into char-damage-fix

src/p_enemy.c

src/p_saveg.c

src/p_setup.c

src/p_spec.c

src/p_user.c

src/w_wad.c

src/w_wad.h