vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into next

Browse source
This commit is contained in:
Alam Arias 2019-03-11 10:01:57 -04:00
parent b9c3e56500 5ca69ce234
commit e2a5e8a18d
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/hardware/r_opengl/r_opengl.c
View file

@ -2056,7 +2056,7 @@ EXPORT void HWRAPI(DrawMD2) (INT32 *gl_cmd_buffer, md2_frame_t *frame, FTransfor
EXPORT void HWRAPI(SetTransform) (FTransform *stransform) EXPORT void HWRAPI(SetTransform) (FTransform *stransform)
{ {
static boolean special_splitscreen; static boolean special_splitscreen;
double used_fov; GLdouble used_fov;
pglLoadIdentity(); pglLoadIdentity();
if (stransform) if (stransform)
{ {

3
src/sdl/i_video.c
View file

@ -1327,6 +1327,7 @@ void I_UpdateNoBlit(void)
// from PrBoom's src/SDL/i_video.c // from PrBoom's src/SDL/i_video.c
static inline boolean I_SkipFrame(void) static inline boolean I_SkipFrame(void)
{ {
#if 0
static boolean skip = false; static boolean skip = false;
if (rendermode != render_soft) if (rendermode != render_soft)
@ -1345,6 +1346,8 @@ static inline boolean I_SkipFrame(void)
default: default:
return false; return false;
} }
#endif
return false;
} }
// //