YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-17 18:40:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into resource

Browse Source
This commit is contained in:
Alibek Omarov 2019-01-30 22:14:13 +03:00
commit 398d6007be
4 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/client/keys.c
View File

@ -527,8 +527,11 @@ Key_IsAllowedAutoRepeat
List of keys that allows auto-repeat List of keys that allows auto-repeat
=================== ===================
*/ */
qboolean Key_IsAllowedAutoRepeat( int key ) static qboolean Key_IsAllowedAutoRepeat( int key )
{ {
if( cls.key_dest != key_game )
return true;
switch( key ) switch( key )
{ {
case K_BACKSPACE: case K_BACKSPACE:

22
engine/common/common.c
View File

@ -20,18 +20,18 @@ GNU General Public License for more details.
#include "client.h" #include "client.h"
#include "library.h" #include "library.h"
const char *file_exts[10] = static const char *file_exts[] =
{ {
".cfg", "cfg",
".lst", "lst",
".exe", "exe",
".vbs", "vbs",
".com", "com",
".bat", "bat",
".dll", "dll",
".ini", "ini",
".log", "log",
".sys", "sys",
}; };
#ifdef _DEBUG #ifdef _DEBUG

10
engine/server/sv_frame.c
View File

@ -998,9 +998,15 @@ void SV_InactivateClients( void )
if( !cl->state || !cl->edict ) if( !cl->state || !cl->edict )
continue; continue;
if( !cl->edict || FBitSet( cl->edict->v.flags, FL_FAKECLIENT )) if( !cl->edict )
continue; continue;
if( FBitSet( cl->edict->v.flags, FL_FAKECLIENT ))
{
SV_DropClient( cl, false );
continue;
}
if( cl->state > cs_connected ) if( cl->state > cs_connected )
cl->state = cs_connected; cl->state = cs_connected;
@ -1015,4 +1021,4 @@ void SV_InactivateClients( void )
MSG_Clear( &cl->netchan.message ); MSG_Clear( &cl->netchan.message );
MSG_Clear( &cl->datagram ); MSG_Clear( &cl->datagram );
} }
} }

7
engine/server/sv_game.c
View File

@ -1294,14 +1294,19 @@ void pfnSetModel( edict_t *e, const char *m )
if( COM_CheckString( name )) if( COM_CheckString( name ))
{ {
qboolean notfound = true;
// check to see if model was properly precached // check to see if model was properly precached
for( i = 1; i < MAX_MODELS && sv.model_precache[i][0]; i++ ) for( i = 1; i < MAX_MODELS && sv.model_precache[i][0]; i++ )
{ {
if( !Q_stricmp( sv.model_precache[i], name )) if( !Q_stricmp( sv.model_precache[i], name ))
{
notfound = false;
break; break;
}
} }
if( i == MAX_MODELS ) if( notfound )
{ {
Con_Printf( S_ERROR "no precache: %s\n", name ); Con_Printf( S_ERROR "no precache: %s\n", name );
return; return;