FWGS
/
Xash3DArchive
Archived
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

27 Oct 2016

This commit is contained in:
g-cont 2016-10-27 00:00:00 +03:00 committed by Alibek Omarov
parent b193257fbd
commit 95d5161351
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/client/gl_local.h
View File

@ -48,7 +48,7 @@ extern byte *r_temppool;
#define RP_FLIPFRONTFACE BIT( 4 ) // e.g. for mirrors drawing
#define RP_NONVIEWERREF (RP_MIRRORVIEW|RP_ENVVIEW)
#define R_StudioOpaque( e ) ( e->curstate.rendermode == kRenderNormal || e->curstate.rendermode == kRenderTransAlpha )
#define R_StudioOpaque( rm ) ( rm == kRenderNormal || rm == kRenderTransAlpha )
#define RP_LOCALCLIENT( e ) (CL_GetLocalPlayer() && ((e)->index == CL_GetLocalPlayer()->index && e->curstate.entityType == ET_PLAYER ))
#define RP_NORMALPASS() ((RI.params & RP_NONVIEWERREF) == 0 )

3
engine/client/gl_rmain.c
View File

@ -1167,7 +1167,10 @@ void R_DrawEntitiesOnList( void )
}
if( RI.drawWorld )
{
pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
clgame.dllFuncs.pfnDrawTransparentTriangles ();
}
if( !RI.refdef.onlyClientDraw )
{

3
engine/client/gl_studio.c
View File

@ -2018,7 +2018,7 @@ static void R_StudioDrawPoints( void )
pglColor4ub( clr->r, clr->g, clr->b, 255 );
alpha = 1.0f;
}
else if( g_nFaceFlags & STUDIO_NF_TRANSPARENT && R_StudioOpaque( RI.currententity ))
else if( g_nFaceFlags & STUDIO_NF_TRANSPARENT && R_StudioOpaque( g_iRenderMode ))
{
GL_SetRenderMode( kRenderTransAlpha );
pglAlphaFunc( GL_GREATER, 0.0f );
@ -2566,6 +2566,7 @@ R_StudioSetupRenderer
*/
static void R_StudioSetupRenderer( int rendermode )
{
if( rendermode > kRenderTransAdd ) rendermode = 0;
g_iRenderMode = bound( 0, rendermode, kRenderTransAdd );
if( clgame.ds.cullMode != GL_NONE ) GL_Cull( GL_FRONT );

9
engine/server/sv_init.c
View File

@ -374,7 +374,7 @@ void SV_ActivateServer( void )
// mapchangecfgfile
{
char *mapchangecfgfile = Cvar_VariableString( "mapchangecfgfile" );
char *mapchangecfgfile = Cvar_VariableString( "mapchangecfgfile" );
if( *mapchangecfgfile ) Cbuf_AddText( va( "exec %s\n", mapchangecfgfile ));
}
}
@ -395,14 +395,14 @@ void SV_DeactivateServer( void )
sv.state = ss_dead;
svgame.dllFuncs.pfnServerDeactivate();
SV_FreeEdicts ();
SV_ClearPhysEnts ();
Mem_EmptyPool( svgame.stringspool );
svgame.dllFuncs.pfnServerDeactivate();
if( sv_maxclients->integer > 32 )
Cvar_SetFloat( "maxplayers", 32.0f );
@ -587,8 +587,11 @@ qboolean SV_SpawnServer( const char *mapname, const char *startspot )
// clear physics interaction links
SV_ClearWorld();
// disabled because invoke crash in battlegrounds mod
#if 0
// tell dlls about new level started
svgame.dllFuncs.pfnParmsNewLevel();
#endif
return true;
}