commit 805c6718912fb2532341f36d8f0b4b5092a35d00
Merge: 31285f01 533e3726
Author: Simon Howard <fraggle@soulsphere.org>
AuthorDate: Tue Nov 22 23:06:25 2016 -0500
Commit: Simon Howard <fraggle@soulsphere.org>
CommitDate: Tue Nov 22 23:06:25 2016 -0500
Merge remote-tracking branch 'origin/master' into sdl2-branch
NEWS.md | 5 +
src/d_iwad.c | 27 +-
src/doom/p_saveg.c | 2 +-
src/heretic/d_main.c | 2 +
src/heretic/doomdef.h | 3 +
src/heretic/g_game.c | 66 ++-
src/heretic/p_saveg.c | 50 +-
src/hexen/g_game.c | 161 ++++--
src/hexen/h2_main.c | 2 +
src/hexen/h2def.h | 3 +
src/hexen/p_acs.c | 2 -
src/hexen/sv_save.c | 1243 ++++++++++++++++++++++++---------------------
src/i_joystick.c | 2 +-
src/i_joystick.h | 2 +-
src/m_config.c | 7 +
src/m_misc.c | 87 ++++
src/m_misc.h | 2 +
src/setup/compatibility.c | 7 +-
src/setup/joystick.c | 2 +-
src/setup/mainmenu.c | 5 +-
src/setup/txt_joybinput.c | 6 +-
src/v_video.c | 78 ++-
22 files changed, 1031 insertions(+), 733 deletions(-)
diff --cc src/setup/mainmenu.c
index 6bcb9eff,974f4bba..80cdda6d
--- a/src/setup/mainmenu.c
+++ b/src/setup/mainmenu.c
@@@ -216,28 -216,30 +216,27 @@@ void MainMenu(void
TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
TXT_AddWidgets(window,
- TXT_NewButton2("Configure Display",
- (TxtWidgetSignalFunc) ConfigDisplay, NULL),
- TXT_NewButton2("Configure Sound",
- (TxtWidgetSignalFunc) ConfigSound, NULL),
- TXT_NewButton2("Configure Keyboard",
- (TxtWidgetSignalFunc) ConfigKeyboard, NULL),
- TXT_NewButton2("Configure Mouse",
- (TxtWidgetSignalFunc) ConfigMouse, NULL),
- TXT_NewButton2("Configure Gamepad/Joystick",
- (TxtWidgetSignalFunc) ConfigJoystick, NULL),
- TXT_NewButton2("Compatibility",
- (TxtWidgetSignalFunc) CompatibilitySettings, NULL),
- NULL);
-
- TXT_AddWidgets(window,
- GetLaunchButton(),
- TXT_NewStrut(0, 1),
- TXT_NewButton2("Start a Network Game",
- (TxtWidgetSignalFunc) StartMultiGame, NULL),
- TXT_NewButton2("Join a Network Game",
- (TxtWidgetSignalFunc) JoinMultiGame, NULL),
- TXT_NewButton2("Multiplayer Configuration",
- (TxtWidgetSignalFunc) MultiplayerConfig, NULL),
- NULL);
+ TXT_NewButton2("Configure Display",
+ (TxtWidgetSignalFunc) ConfigDisplay, NULL),
+ TXT_NewButton2("Configure Sound",
+ (TxtWidgetSignalFunc) ConfigSound, NULL),
+ TXT_NewButton2("Configure Keyboard",
+ (TxtWidgetSignalFunc) ConfigKeyboard, NULL),
+ TXT_NewButton2("Configure Mouse",
+ (TxtWidgetSignalFunc) ConfigMouse, NULL),
+ TXT_NewButton2("Configure Gamepad/Joystick",
+ (TxtWidgetSignalFunc) ConfigJoystick, NULL),
- TXT_If(gamemission == doom || gamemission == strife,
- TXT_NewButton2("Compatibility",
- (TxtWidgetSignalFunc) CompatibilitySettings, NULL)),
++ TXT_NewButton2("Compatibility",
++ (TxtWidgetSignalFunc) CompatibilitySettings, NULL),
+ GetLaunchButton(),
+ TXT_NewStrut(0, 1),
+ TXT_NewButton2("Start a Network Game",
+ (TxtWidgetSignalFunc) StartMultiGame, NULL),
+ TXT_NewButton2("Join a Network Game",
+ (TxtWidgetSignalFunc) JoinMultiGame, NULL),
+ TXT_NewButton2("Multiplayer Configuration",
+ (TxtWidgetSignalFunc) MultiplayerConfig, NULL),
+ NULL);
quit_action = TXT_NewWindowAction(KEY_ESCAPE, "Quit");
warp_action = TXT_NewWindowAction(KEY_F2, "Warp");