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

15 Sep 2016

This commit is contained in:
g-cont 2016-09-15 00:00:00 +03:00 committed by Alibek Omarov
parent 6445a52686
commit 1c8fe772e3
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/client/gl_warp.c
View File

@ -539,7 +539,7 @@ void R_CloudTexCoord( vec3_t v, float speed, float *s, float *t )
/*
===============
Sky_DrawFaceQuad
R_CloudDrawPoly
===============
*/
void R_CloudDrawPoly( glpoly_t *p )

4
engine/common/build.c
View File

@ -23,7 +23,7 @@ static char mond[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
int Q_buildnum( void )
{
// do not touch this! Only author of Xash3D can increase buildnumbers!
#if 1
#if 0
int m = 0, d = 0, y = 0;
static int b = 0;
@ -48,6 +48,6 @@ int Q_buildnum( void )
return b;
#else
return 3477;
return 3509;
#endif
}

14
engine/server/sv_game.c
View File

@ -266,7 +266,7 @@ MSG_PVS send to clients potentially visible from org
MSG_PHS send to clients potentially hearable from org
=================
*/
qboolean SV_Send( int dest, const vec3_t origin, const edict_t *ent )
qboolean SV_Send( int dest, const vec3_t origin, const edict_t *ent, qboolean usermessage )
{
byte *mask = NULL;
int j, numclients = sv_maxclients->integer;
@ -333,7 +333,7 @@ qboolean SV_Send( int dest, const vec3_t origin, const edict_t *ent )
if( cl->state == cs_free || cl->state == cs_zombie )
continue;
if( cl->state != cs_spawned && !reliable )
if( cl->state != cs_spawned && ( !reliable || usermessage ))
continue;
if( specproxy && !cl->hltv_proxy )
@ -1999,7 +1999,7 @@ void SV_StartSound( edict_t *ent, int chan, const char *sample, float vol, float
BF_WriteWord( &sv.multicast, entityIndex );
BF_WriteVec3Coord( &sv.multicast, origin );
SV_Send( msg_dest, origin, NULL );
SV_Send( msg_dest, origin, NULL, false );
}
/*
@ -2079,7 +2079,7 @@ void pfnEmitAmbientSound( edict_t *ent, float *pos, const char *sample, float vo
BF_WriteWord( &sv.multicast, number );
BF_WriteVec3Coord( &sv.multicast, pos );
SV_Send( msg_dest, pos, NULL );
SV_Send( msg_dest, pos, NULL, false );
}
/*
@ -2092,7 +2092,7 @@ void SV_StartMusic( const char *curtrack, const char *looptrack, fs_offset_t pos
{
BF_WriteByte( &sv.multicast, svc_stufftext );
BF_WriteString( &sv.multicast, va( "music \"%s\" \"%s\" %i\n", curtrack, looptrack, position ));
SV_Send( MSG_ALL, NULL, NULL );
SV_Send( MSG_ALL, NULL, NULL, false );
}
/*
@ -2617,7 +2617,7 @@ void pfnMessageEnd( void )
if( !VectorIsNull( svgame.msg_org )) org = svgame.msg_org;
svgame.msg_dest = bound( MSG_BROADCAST, svgame.msg_dest, MSG_SPEC );
SV_Send( svgame.msg_dest, org, svgame.msg_ent );
SV_Send( svgame.msg_dest, org, svgame.msg_ent, true );
}
/*
@ -3115,7 +3115,7 @@ int pfnRegUserMsg( const char *pszName, int iSize )
BF_WriteByte( &sv.multicast, svgame.msg[i].number );
BF_WriteByte( &sv.multicast, (byte)iSize );
BF_WriteString( &sv.multicast, svgame.msg[i].name );
SV_Send( MSG_ALL, NULL, NULL );
SV_Send( MSG_ALL, NULL, NULL, false );
}
return svgame.msg[i].number;

13
engine/server/sv_main.c
View File

@ -208,7 +208,18 @@ void SV_UpdateMovevars( qboolean initialize )
// check range
if( sv_zmax->value < 256.0f ) Cvar_SetFloat( "sv_zmax", 256.0f );
if( sv_zmax->value > 131070.0f ) Cvar_SetFloat( "sv_zmax", 131070.0f );
// clamp it right
if( host.features & ENGINE_WRITE_LARGE_COORD )
{
if( sv_zmax->value > 131070.0f )
Cvar_SetFloat( "sv_zmax", 131070.0f );
}
else
{
if( sv_zmax->value > 32767.0f )
Cvar_SetFloat( "sv_zmax", 32767.0f );
}
svgame.movevars.gravity = sv_gravity->value;
svgame.movevars.stopspeed = sv_stopspeed->value;