commit 31285f01f292ca3b70851e5551e97f2d483924f4
Merge: 85b0d244 15b8e6e1
Author: Mike Swanson <mikeonthecomputer@gmail.com>
AuthorDate: Mon Oct 24 14:00:30 2016 -0700
Commit: Mike Swanson <mikeonthecomputer@gmail.com>
CommitDate: Mon Oct 24 14:00:30 2016 -0700
Merge branch 'master' into sdl2-branch
NEWS.md | 4 ++
README.Music.md | 31 +++++----
src/d_iwad.c | 2 +
src/doom/g_game.c | 3 -
src/doom/p_saveg.c | 3 -
src/doom/p_saveg.h | 3 +
src/doomtype.h | 1 +
src/heretic/d_main.c | 13 ++++
src/heretic/d_net.c | 16 ++++-
src/heretic/doomdef.h | 5 ++
src/heretic/g_game.c | 169 +++++++++++++++++++++++++++++++++++++++++----
src/heretic/r_bsp.c | 1 +
src/hexen/d_net.c | 17 ++++-
src/hexen/g_game.c | 185 ++++++++++++++++++++++++++++++++++++++++++++++----
src/hexen/h2_main.c | 13 ++++
src/hexen/h2def.h | 5 ++
src/hexen/mn_menu.c | 12 ++++
src/hexen/p_acs.c | 19 ++++++
src/hexen/p_enemy.c | 7 ++
src/hexen/p_spec.h | 1 +
src/i_sdlsound.c | 8 ++-
21 files changed, 466 insertions(+), 52 deletions(-)
diff --cc README.Music.md
index 4a18e491,3c3e0dae..5af030c0
--- a/README.Music.md
+++ b/README.Music.md
@@@ -9,10 -9,10 +9,10 @@@ MIDI playback; some have very good qual
example). To use this, choose “Native MIDI” in the sound configuration
dialog in the setup tool.
- ## Timidity
+ # Timidity
Timidity is a software-based MIDI synthesizer, and a version of it is
-included in the SDL_mixer library used by Chocolate Doom. To use
+included in the SDL2_mixer library used by Chocolate Doom. To use
Timidity for MIDI playback, first download a sound font. An example of
a good quality sound font is the eawpats font, which can be downloaded
from the idgames archive as sounds/eawpats.zip:
diff --cc src/heretic/g_game.c
index 631687b5,09558846..52dde426
--- a/src/heretic/g_game.c
+++ b/src/heretic/g_game.c
@@@ -22,9 -22,9 +22,10 @@@
#include "doomdef.h"
#include "doomkeys.h"
#include "deh_str.h"
+#include "i_input.h"
#include "i_timer.h"
#include "i_system.h"
+ #include "m_argv.h"
#include "m_controls.h"
#include "m_misc.h"
#include "m_random.h"
diff --cc src/heretic/r_bsp.c
index 6e295825,6fed7f74..1e9d3be7
--- a/src/heretic/r_bsp.c
+++ b/src/heretic/r_bsp.c
@@@ -16,8 -16,8 +16,9 @@@
// R_bsp.c
#include "doomdef.h"
+ #include "i_system.h"
#include "m_bbox.h"
+#include "i_system.h"
#include "r_local.h"
seg_t *curline;