commit 5974dfc9cee388421768bea3ff67e7af11f8bb62
Merge: 93e591e1 f0bef91e
Author: Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Sat Sep 17 13:12:26 2016 +0200
Commit: Fabian Greffrath <fabian@greffrath.com>
CommitDate: Sat Sep 17 13:12:26 2016 +0200
Merge branch 'master' into sdl2-branch
.github/CONTRIBUTING.md | 5 ++
.gitignore | 1 +
NEWS.md | 8 +++
configure.ac | 6 ---
msvc/.gitignore | 1 +
msvc/hexen.vcproj | 1 +
opl/opl3.c | 48 ++++++++++++------
opl/opl3.h | 4 +-
src/.gitignore | 2 +
src/d_iwad.c | 21 +++++---
src/doom/am_map.c | 22 ++++++++
src/doom/d_main.c | 1 +
src/doom/g_game.c | 5 +-
src/doom/m_random.c | 7 +++
src/doom/m_random.h | 3 +-
src/doom/p_enemy.c | 10 ++--
src/doom/p_map.c | 4 +-
src/doom/p_mobj.c | 6 +--
src/doom/p_pspr.c | 10 ++--
src/doom/p_spec.c | 2 +-
src/doom/r_bsp.c | 14 +++++-
src/heretic/am_map.c | 20 ++++++++
src/heretic/m_random.c | 6 +++
src/heretic/m_random.h | 3 ++
src/heretic/p_enemy.c | 68 +++++++++++++++----------
src/heretic/p_inter.c | 6 +--
src/heretic/p_map.c | 4 +-
src/heretic/p_mobj.c | 24 ++++-----
src/heretic/p_pspr.c | 20 ++++----
src/heretic/p_user.c | 2 +-
src/heretic/r_bsp.c | 13 ++++-
src/hexen/a_action.c | 45 ++++++++++-------
src/hexen/am_map.c | 25 ++++++++++
src/hexen/m_random.c | 6 +++
src/hexen/m_random.h | 3 ++
src/hexen/p_enemy.c | 82 +++++++++++++++++++-----------
src/hexen/p_map.c | 4 +-
src/hexen/p_mobj.c | 28 +++++------
src/hexen/p_pspr.c | 27 +++++++---
src/hexen/r_bsp.c | 13 ++++-
src/i_sdlmusic.c | 2 +-
src/i_sdlsound.c | 4 +-
src/i_video.c | 3 +-
src/m_config.c | 6 +++
src/m_controls.c | 2 +
src/m_controls.h | 1 +
src/net_server.c | 5 +-
src/setup/joystick.c | 125 +++++++++++++++++++++++++++++++++++++++-------
src/setup/txt_joybinput.c | 1 +
src/strife/am_map.c | 23 +++++++++
src/strife/g_game.c | 3 +-
src/strife/p_spec.c | 2 +-
src/strife/r_bsp.c | 14 +++++-
src/v_diskicon.c | 15 +++---
src/v_video.c | 1 +
src/w_wad.c | 13 +++++
src/z_zone.c | 4 +-
57 files changed, 588 insertions(+), 216 deletions(-)
diff --cc src/i_sdlmusic.c
index 7d052760,ca04218c..b52175b7
--- a/src/i_sdlmusic.c
+++ b/src/i_sdlmusic.c
@@@ -900,8 -900,29 +900,8 @@@ static boolean I_SDL_InitMusic(void
{
int i;
- // SDL_mixer prior to v1.2.11 has a bug that causes crashes
- // with MIDI playback. Print a warning message if we are
- // using an old version.
-
-#ifdef __MACOSX__
- {
- const SDL_version *v = Mix_Linked_Version();
-
- if (SDL_VERSIONNUM(v->major, v->minor, v->patch)
- < SDL_VERSIONNUM(1, 2, 11))
- {
- printf("\n"
- " *** WARNING ***\n"
- " You are using an old version of SDL_mixer.\n"
- " Music playback on this version may cause crashes\n"
- " under OS X and is disabled by default.\n"
- "\n");
- }
- }
-#endif
-
//!
- // @arg <output filename>
+ // @arg <filename>
//
// Read all MIDI files from loaded WAD files, dump an example substitution
// music config file to the specified filename and quit.
diff --cc src/i_video.c
index 14302009,e454aedd..933e7078
--- a/src/i_video.c
+++ b/src/i_video.c
@@@ -823,8 -1436,19 +824,8 @@@ void I_GraphicsCheckCommandLine(void
// Disable blitting the screen.
//
- noblit = M_CheckParm ("-noblit");
+ noblit = M_CheckParm ("-noblit");
- //!
- // @category video
- //
- // Grab the mouse when running in windowed mode.
- //
-
- if (M_CheckParm("-grabmouse"))
- {
- grabmouse = true;
- }
-
//!
// @category video
//