open client sockets before video starts, so that the Windows Firewall

[xonotic/darkplaces.git] / cl_parse.c

diff --git a/cl_parse.c b/cl_parse.c
index 07ae54f4982fb7ceee2117bffc843a25c33bf34e..d6b70ac250c72a93e6210bc714890b903c05bcc0 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -434,7 +434,7 @@ static qboolean QW_CL_CheckOrDownloadFile(const char *filename)
        qfile_t *file;
 
        // see if the file already exists
-       file = FS_Open(filename, "rb", true, false);
+       file = FS_OpenVirtualFile(filename, true);
        if (file)
        {
                FS_Close(file);
@@ -1541,6 +1541,10 @@ void CL_ParseServerInfo (void)
 
        // parse gametype
                cl.gametype = MSG_ReadByte ();
+               // the original id singleplayer demos are bugged and contain
+               // GAME_DEATHMATCH even for singleplayer
+               if (cl.maxclients == 1 && cls.protocol == PROTOCOL_QUAKE)
+                       cl.gametype = GAME_COOP;
 
        // parse signon message
                str = MSG_ReadString ();
@@ -1640,7 +1644,7 @@ void CL_ParseServerInfo (void)
 
                Con_Printf ("Auto-recording to %s.\n", demofile);
 
-               cls.demofile = FS_Open (demofile, "wb", false, false);
+               cls.demofile = FS_OpenRealFile(demofile, "wb", false);
                if (cls.demofile)
                {
                        cls.forcetrack = -1;
@@ -2712,7 +2716,7 @@ static void CL_IPLog_Load(void)
                        text++;
                if (line[0] == '/' && line[1] == '/')
                        continue; // skip comments if anyone happens to add them
-               for (i = 0;i < len && line[i] > ' ';i++)
+               for (i = 0;i < len && !ISWHITESPACE(line[i]);i++)
                        address[i] = line[i];
                address[i] = 0;
                // skip exactly one space character