Merge branch 'master' into resource

engine/client/keys.c

@@ -527,8 +527,11 @@ Key_IsAllowedAutoRepeat
 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 )
 	{
 	case K_BACKSPACE:

engine/common/common.c

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

engine/server/sv_frame.c

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

engine/server/sv_game.c

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