Revert "Make cdda optional, server does not need to play music" because it

[xonotic/darkplaces.git] / cl_parse.c

diff --git a/cl_parse.c b/cl_parse.c
index 506e53f3c9907f8b0a9eddfafd67b0ec1a127042..c16b8eaae4d45bc3a644e3c824c6f4f6a6774200 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -368,7 +368,7 @@ void CL_KeepaliveMessage (qboolean readmessages)
                msg.data = buf;
                msg.maxsize = sizeof(buf);
                MSG_WriteChar(&msg, clc_nop);
-               NetConn_SendUnreliableMessage(cls.netcon, &msg, cls.protocol, 10000, false);
+               NetConn_SendUnreliableMessage(cls.netcon, &msg, cls.protocol, 10000, 0, false);
        }
 
        recursive = thisrecursive;
@@ -1553,6 +1553,9 @@ static void CL_SendPlayerInfo(void)
        MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
        MSG_WriteString (&cls.netcon->message, va(vabuf, sizeof(vabuf), "rate %i", cl_rate.integer));
 
+       MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
+       MSG_WriteString (&cls.netcon->message, va(vabuf, sizeof(vabuf), "rate_burstsize %i", cl_rate_burstsize.integer));
+
        if (cl_pmodel.integer)
        {
                MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
@@ -2210,7 +2213,7 @@ static void CL_ParseClientdata (void)
                cl.stats[STAT_NAILS] = MSG_ReadByte(&cl_message);
                cl.stats[STAT_ROCKETS] = MSG_ReadByte(&cl_message);
                cl.stats[STAT_CELLS] = MSG_ReadByte(&cl_message);
-               if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_NEXUIZ)
+               if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_QUOTH || gamemode == GAME_NEXUIZ)
                        cl.stats[STAT_ACTIVEWEAPON] = (1<<MSG_ReadByte(&cl_message));
                else
                        cl.stats[STAT_ACTIVEWEAPON] = MSG_ReadByte(&cl_message);
@@ -3003,9 +3006,12 @@ static void CL_IPLog_Add(const char *address, const char *name, qboolean checkex
                // add it to the iplog.txt file
                // TODO: this ought to open the one in the userpath version of the base
                // gamedir, not the current gamedir
+// not necessary for mobile
+#ifndef DP_MOBILETOUCH
                Log_Printf(cl_iplog_name.string, "%s %s\n", address, name);
                if (developer_extra.integer)
                        Con_DPrintf("CL_IPLog_Add: appending this line to %s: %s %s\n", cl_iplog_name.string, address, name);
+#endif
        }
 }
 
@@ -3020,7 +3026,12 @@ static void CL_IPLog_Load(void)
        cl_iplog_loaded = true;
        // TODO: this ought to open the one in the userpath version of the base
        // gamedir, not the current gamedir
+// not necessary for mobile
+#ifndef DP_MOBILETOUCH
        filedata = FS_LoadFile(cl_iplog_name.string, tempmempool, true, &filesize);
+#else
+       filedata = NULL;
+#endif
        if (!filedata)
                return;
        text = (char *)filedata;