From 775ccde424f57d533a93ac44db6a7905a18c16f8 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Tue, 1 Sep 2015 12:45:26 +0100
Subject: [PATCH 1/4] Add M_Options(0); to F4/F5/F7 code to prevent them going
to Main Menu instead of SP/MP pause menus when the latter should be shown
---
src/m_menu.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/m_menu.c b/src/m_menu.c
index 06aaac0ef..c7a9fcc16 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -2203,6 +2203,7 @@ boolean M_Responder(event_t *ev)
if (modeattacking)
return true;
M_StartControlPanel();
+ M_Options(0);
currentMenu = &OP_SoundOptionsDef;
itemOn = 0;
return true;
@@ -2212,6 +2213,7 @@ boolean M_Responder(event_t *ev)
if (modeattacking)
return true;
M_StartControlPanel();
+ M_Options(0);
M_VideoModeMenu(0);
return true;
#endif
@@ -2223,6 +2225,7 @@ boolean M_Responder(event_t *ev)
if (modeattacking)
return true;
M_StartControlPanel();
+ M_Options(0);
M_SetupNextMenu(&OP_MainDef);
return true;
From 146011937a3c92960cd3be0fbe2314c21852bcbb Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Sun, 10 Jan 2016 18:24:58 +0000
Subject: [PATCH 2/4] Fixed what appears to be a minor including error in
sdl/i_system.c
Basically, Wolfy's linux (non-CMake) compiling apparently fails here, and config.in.h actually lives outside of the sdl folder. Blame a particular someone for blindly copy+pasting these includes in this file without considering the consequences when adding support for CMake everywhere.
---
src/sdl/i_system.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index fa09dc343..4b45c373c 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -21,9 +21,9 @@
/// \brief SRB2 system stuff for SDL
#ifdef CMAKECONFIG
-#include "config.h"
+#include "../config.h"
#else
-#include "config.h.in"
+#include "../config.h.in"
#endif
#ifndef _WIN32_WCE
From be266c27e11a4770f5a23212c8b0c78b6f1432b5 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Sun, 10 Jan 2016 20:56:09 +0000
Subject: [PATCH 3/4] Removed void typedef for GLPatch_t used when HWRENDER is
undefined
Apparently all parts of the source code that require GLPatch_t are themselves used only if HWRENDER is defined. Do I need to say more?
Not sure if this will fix Wolfy's latest problem or not though
---
src/w_wad.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/w_wad.h b/src/w_wad.h
index 614b7e4ae..d283c54a0 100644
--- a/src/w_wad.h
+++ b/src/w_wad.h
@@ -16,8 +16,6 @@
#ifdef HWRENDER
#include "hardware/hw_data.h"
-#else
-typedef void GLPatch_t;
#endif
#ifdef __GNUG__
From a8e4234d743726a9a0957a5193be96447263beb6 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Mon, 11 Jan 2016 14:51:55 +0000
Subject: [PATCH 4/4] Fixed implicit declaration of some functions if compiling
without OpenGL support
Not related to Wolfy's problems afaik... this branch seems to be turning into a misc compiling fixes branch now
---
src/sdl/i_video.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index faee1bc69..dbb97f093 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -217,10 +217,12 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
}
}
+#ifdef HWRENDER
if (rendermode == render_opengl)
{
OglSdlSurface(vid.width, vid.height);
}
+#endif
if (rendermode == render_soft)
{
@@ -401,9 +403,11 @@ static INT32 Impl_SDL_Scancode_To_Keycode(SDL_Scancode code)
default:
break;
}
+#ifdef HWRENDER
DBG_Printf("Unknown incoming scancode: %d, represented %c\n",
code,
SDL_GetKeyName(SDL_GetKeyFromScancode(code)));
+#endif
return 0;
}