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

20 Aug 2016

This commit is contained in:
g-cont 2016-08-20 00:00:00 +03:00 committed by Alibek Omarov
parent e9889b21ca
commit 7a9aadec2b
5 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/client/cl_frame.c
View File

@ -249,12 +249,12 @@ void CL_UpdateEntityFields( cl_entity_t *ent )
if( ent->player && RP_LOCALCLIENT( ent )) // stupid Half-Life bug
ent->angles[PITCH] = -ent->angles[PITCH] / 3.0f;
// make me lerp
if( ent->index == cl.predicted.onground && cl.predicted.moving )
// make me lerp (multiplayer only. this code visually breaks XashXT parent system)
if( ent->index == cl.predicted.onground && cl.predicted.moving && ( cl.maxclients > 1 ))
{
CL_InterpolateMovingEntity( ent );
}
else if( ent->model && ent->model->type == mod_brush && ent->curstate.animtime != 0.0f)
else if( ent->model && ent->model->type == mod_brush && ent->curstate.animtime != 0.0f )
{
float d, f = 0.0f;
int i;

7
engine/client/gl_vidnt.c
View File

@ -1478,7 +1478,8 @@ qboolean R_Init_OpenGL( void )
if( !opengl_dll.link )
return false;
GL_CheckExtension( "OpenGL Internal ProcAddress", wglproc_funcs, NULL, GL_WGL_PROCADDRESS );
if( Sys_CheckParm( "-gldebug" ) && host.developer >= 1 )
GL_CheckExtension( "OpenGL Internal ProcAddress", wglproc_funcs, NULL, GL_WGL_PROCADDRESS );
return VID_SetMode();
}
@ -1717,6 +1718,10 @@ void GL_InitExtensions( void )
glConfig.extensions_string = pglGetString( GL_EXTENSIONS );
MsgDev( D_INFO, "Video: %s\n", glConfig.renderer_string );
// initalize until base opengl functions loaded (old-context)
if( !Sys_CheckParm( "-gldebug" ) || host.developer < 1 )
GL_CheckExtension( "OpenGL Internal ProcAddress", wglproc_funcs, NULL, GL_WGL_PROCADDRESS );
// windows-specific extensions
GL_CheckExtension( "WGL Extensions String", wglgetextensionsstring, NULL, GL_WGL_EXTENSIONS );

3
engine/common/soundlib/snd_wav.c
View File

@ -76,8 +76,7 @@ static void FindNextChunk( const char *name )
iff_dataPtr += 4;
iff_chunkLen = GetLittleLong();
// limit chunk size to 1 mb
if( iff_chunkLen < 0 || iff_chunkLen > ( 1024 * 1024 ))
if( iff_chunkLen < 0 )
{
iff_dataPtr = NULL;
return;

8
engine/server/sv_client.c
View File

@ -1879,14 +1879,6 @@ void SV_UserinfoChanged( sv_client_t *cl, const char *userinfo )
}
else cl->modelindex = 0;
// force reset player model to "player"
if( cl->modelindex == 0 )
{
Info_SetValueForKey( cl->userinfo, "model", "player" );
Mod_RegisterModel( "models/player.mdl", SV_ModelIndex( "models/player.mdl" ));
SV_SetModel( ent, "models/player.mdl" );
}
// call prog code to allow overrides
svgame.dllFuncs.pfnClientUserInfoChanged( cl->edict, cl->userinfo );
ent->v.netname = MAKE_STRING( cl->name );

7
engine/server/sv_main.c
View File

@ -549,12 +549,7 @@ Host_ServerFrame
void Host_ServerFrame( void )
{
// if server is not active, do nothing
if( !svs.initialized )
{
// but allow rcon
SV_ReadPackets ();
return;
}
if( !svs.initialized ) return;
svgame.globals->frametime = host.frametime;