mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2025-02-09 17:51:17 +00:00
Merge branch 'master' into next
This commit is contained in:
commit
e2a5e8a18d
2 changed files with 4 additions and 1 deletions
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
Loading…
Reference in a new issue