stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-17 10:11:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into md2_colourchange

Browse source
This commit is contained in:
Sean Ryder 2016-01-12 23:52:04 +00:00
commit 6a67609b74
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/m_menu.c
View file

@ -2203,6 +2203,7 @@ boolean M_Responder(event_t *ev)
if (modeattacking) if (modeattacking)
return true; return true;
M_StartControlPanel(); M_StartControlPanel();
M_Options(0);
currentMenu = &OP_SoundOptionsDef; currentMenu = &OP_SoundOptionsDef;
itemOn = 0; itemOn = 0;
return true; return true;
@ -2212,6 +2213,7 @@ boolean M_Responder(event_t *ev)
if (modeattacking) if (modeattacking)
return true; return true;
M_StartControlPanel(); M_StartControlPanel();
M_Options(0);
M_VideoModeMenu(0); M_VideoModeMenu(0);
return true; return true;
#endif #endif
@ -2223,6 +2225,7 @@ boolean M_Responder(event_t *ev)
if (modeattacking) if (modeattacking)
return true; return true;
M_StartControlPanel(); M_StartControlPanel();
M_Options(0);
M_SetupNextMenu(&OP_MainDef); M_SetupNextMenu(&OP_MainDef);
return true; return true;

4
src/sdl/i_system.c
View file

@ -21,9 +21,9 @@
/// \brief SRB2 system stuff for SDL /// \brief SRB2 system stuff for SDL
#ifdef CMAKECONFIG #ifdef CMAKECONFIG
#include "config.h" #include "../config.h"
#else #else
#include "config.h.in" #include "../config.h.in"
#endif #endif
#ifndef _WIN32_WCE #ifndef _WIN32_WCE

4
src/sdl/i_video.c
View file

@ -217,10 +217,12 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
} }
} }
#ifdef HWRENDER
if (rendermode == render_opengl) if (rendermode == render_opengl)
{ {
OglSdlSurface(vid.width, vid.height); OglSdlSurface(vid.width, vid.height);
} }
#endif
if (rendermode == render_soft) if (rendermode == render_soft)
{ {
@ -401,9 +403,11 @@ static INT32 Impl_SDL_Scancode_To_Keycode(SDL_Scancode code)
default: default:
break; break;
} }
#ifdef HWRENDER
DBG_Printf("Unknown incoming scancode: %d, represented %c\n", DBG_Printf("Unknown incoming scancode: %d, represented %c\n",
code, code,
SDL_GetKeyName(SDL_GetKeyFromScancode(code))); SDL_GetKeyName(SDL_GetKeyFromScancode(code)));
#endif
return 0; return 0;
} }

2
src/w_wad.h
View file

@ -16,8 +16,6 @@
#ifdef HWRENDER #ifdef HWRENDER
#include "hardware/hw_data.h" #include "hardware/hw_data.h"
#else
typedef void GLPatch_t;
#endif #endif
#ifdef __GNUG__ #ifdef __GNUG__