thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'public_next' into master

Browse source
This commit is contained in:
Alam Ed Arias 2016-01-14 12:37:04 -05:00
commit 1a56d48cd9
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/hardware/hw_md2.c
View file

@ -1085,7 +1085,7 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
if (!cv_grmd2.value) if (!cv_grmd2.value)
return; return;
if (!spr->precip) if (spr->precip)
return; return;
// MD2 colormap fix // MD2 colormap fix

2
src/sdl/i_system.c
View file

@ -23,7 +23,7 @@
#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__