eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

compile fixes

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5275 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2018-07-22 12:53:36 +00:00
parent 0fee3a4aea
commit f45eb4580e
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/common/cmd.c
View file

@ -2898,7 +2898,7 @@ void Cmd_ExecuteString (const char *text, int level)
if (MP_ConsoleCommand(text)) if (MP_ConsoleCommand(text))
return; //let the csqc handle it if it wants. return; //let the csqc handle it if it wants.
#endif #endif
#if defined(MENU_NATIVECODE) #if defined(MENU_NATIVECODE) && !defined(SERVERONLY)
if (mn_entry && mn_entry->ConsoleCommand(text, cmd_argc, (char const*const*)cmd_argv)) if (mn_entry && mn_entry->ConsoleCommand(text, cmd_argc, (char const*const*)cmd_argv))
return; return;
#endif #endif

15
engine/gl/gl_shadow.c
View file

@ -250,7 +250,7 @@ static void SHM_MeshFrontOnly(int numverts, vecV_t *verts, int numidx, index_t *
sh_shmesh->numverts += numverts; sh_shmesh->numverts += numverts;
sh_shmesh->numindicies += numidx; sh_shmesh->numindicies += numidx;
} }
static void SHM_MeshBackOnly(int numverts, vecV_t *verts, int numidx, index_t *idx) /*static void SHM_MeshBackOnly(int numverts, vecV_t *verts, int numidx, index_t *idx)
{ {
int first = sh_shmesh->numverts; int first = sh_shmesh->numverts;
int v, i; int v, i;
@ -289,7 +289,7 @@ static void SHM_MeshBackOnly(int numverts, vecV_t *verts, int numidx, index_t *i
sh_shmesh->numverts += numverts; sh_shmesh->numverts += numverts;
sh_shmesh->numindicies += numidx; sh_shmesh->numindicies += numidx;
} }*/
static void SHM_TriangleFan(int numverts, vecV_t *verts, vec3_t lightorg, float pd) static void SHM_TriangleFan(int numverts, vecV_t *verts, vec3_t lightorg, float pd)
{ {
int v, i, idxs; int v, i, idxs;
@ -2325,10 +2325,7 @@ static void Sh_GenShadowFace(dlight_t *l, vec3_t axis[3], int lighttype, shadowm
R_SetFrustum(proj, r_refdef.m_view); R_SetFrustum(proj, r_refdef.m_view);
if (lighttype & LSHADER_ORTHO) if (lighttype & LSHADER_ORTHO)
{
r_refdef.frustum_numplanes = 4; //kill the near clip plane - we allow ANYTHING nearer through. r_refdef.frustum_numplanes = 4; //kill the near clip plane - we allow ANYTHING nearer through.
qglEnable(GL_DEPTH_CLAMP_ARB);
}
#ifdef SHADOWDBG_COLOURNOTDEPTH #ifdef SHADOWDBG_COLOURNOTDEPTH
BE_SelectMode(BEM_STANDARD); BE_SelectMode(BEM_STANDARD);
@ -2342,6 +2339,8 @@ static void Sh_GenShadowFace(dlight_t *l, vec3_t axis[3], int lighttype, shadowm
#ifdef GLQUAKE #ifdef GLQUAKE
case QR_OPENGL: case QR_OPENGL:
GL_ViewportUpdate(); GL_ViewportUpdate();
if (lighttype & LSHADER_ORTHO)
qglEnable(GL_DEPTH_CLAMP_ARB);
GL_CullFace(SHADER_CULL_FRONT); GL_CullFace(SHADER_CULL_FRONT);
GLBE_RenderShadowBuffer(smesh->numverts, smesh->vebo[0], smesh->verts, smesh->numindicies, smesh->vebo[1], smesh->indicies); GLBE_RenderShadowBuffer(smesh->numverts, smesh->vebo[0], smesh->verts, smesh->numindicies, smesh->vebo[1], smesh->indicies);
break; break;
@ -2383,6 +2382,9 @@ static void Sh_GenShadowFace(dlight_t *l, vec3_t axis[3], int lighttype, shadowm
#ifdef GLQUAKE #ifdef GLQUAKE
case QR_OPENGL: case QR_OPENGL:
GLBE_BaseEntTextures(); GLBE_BaseEntTextures();
if (lighttype & LSHADER_ORTHO)
qglDisable(GL_DEPTH_CLAMP_ARB);
break; break;
#endif #endif
#ifdef D3D9QUAKE #ifdef D3D9QUAKE
@ -2402,9 +2404,6 @@ static void Sh_GenShadowFace(dlight_t *l, vec3_t axis[3], int lighttype, shadowm
#endif #endif
} }
if (lighttype & LSHADER_ORTHO)
qglDisable(GL_DEPTH_CLAMP_ARB);
/* /*
{ {
int i; int i;