make DP compile with C++ again

[xonotic/darkplaces.git] / cl_parse.c

diff --git a/cl_parse.c b/cl_parse.c
index 41aeb0d98fcf2919cfeb4ff5e029045986721663..0b8af8ed6165c6ba897d714e529f395a9ea3a743 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -188,7 +188,7 @@ void QW_CL_StartUpload(unsigned char *data, int size);
 //static qboolean QW_CL_IsUploading(void);
 static void QW_CL_StopUpload(void);
 void CL_VM_UpdateIntermissionState(int intermission);
-qboolean CL_VM_Event_Sound(int sound_num, int volume, int channel, float attenuation, int ent, vec3_t pos);
+qboolean CL_VM_Event_Sound(int sound_num, float volume, int channel, float attenuation, int ent, vec3_t pos);
 
 /*
 ==================
@@ -1313,7 +1313,7 @@ void CL_DownloadBegin_f(void)
        // we're really beginning a download now, so initialize stuff
        strlcpy(cls.qw_downloadname, Cmd_Argv(2), sizeof(cls.qw_downloadname));
        cls.qw_downloadmemorymaxsize = size;
-       cls.qw_downloadmemory = Mem_Alloc(cls.permanentmempool, cls.qw_downloadmemorymaxsize);
+       cls.qw_downloadmemory = (unsigned char *) Mem_Alloc(cls.permanentmempool, cls.qw_downloadmemorymaxsize);
        cls.qw_downloadnumber++;
 
        cls.qw_download_deflate = false;
@@ -1531,7 +1531,7 @@ void CL_ParseServerInfo (void)
                cl.movevars_wallfriction = 0;
                cl.movevars_timescale = 1;
                cl.movevars_jumpvelocity = 270;
-               cl.movevars_edgefriction = 2;
+               cl.movevars_edgefriction = 1;
                cl.movevars_maxairspeed = 30;
                cl.movevars_stepheight = 18;
                cl.movevars_airaccel_qw = 1;
@@ -1706,7 +1706,7 @@ void CL_ValidateState(entity_state_t *s)
        // (this used to happen, sometimes affecting skin and frame)
 
        // colormap is client index + 1
-       if ((!s->flags & RENDER_COLORMAPPED) && s->colormap > cl.maxclients)
+       if (!(s->flags & RENDER_COLORMAPPED) && s->colormap > cl.maxclients)
                Con_DPrintf("CL_ValidateState: colormap (%i) > cl.maxclients (%i)\n", s->colormap, cl.maxclients);
 
        model = cl.model_precache[s->modelindex];
@@ -2695,7 +2695,7 @@ static void CL_IPLog_Add(const char *address, const char *name, qboolean checkex
        {
                cl_iplog_item_t *olditems = cl_iplog_items;
                cl_iplog_maxitems = max(1024, cl_iplog_maxitems + 256);
-               cl_iplog_items = Mem_Alloc(cls.permanentmempool, cl_iplog_maxitems * sizeof(cl_iplog_item_t));
+               cl_iplog_items = (cl_iplog_item_t *) Mem_Alloc(cls.permanentmempool, cl_iplog_maxitems * sizeof(cl_iplog_item_t));
                if (olditems)
                {
                        if (cl_iplog_numitems)
@@ -2703,8 +2703,8 @@ static void CL_IPLog_Add(const char *address, const char *name, qboolean checkex
                        Mem_Free(olditems);
                }
        }
-       cl_iplog_items[cl_iplog_numitems].address = Mem_Alloc(cls.permanentmempool, strlen(address) + 1);
-       cl_iplog_items[cl_iplog_numitems].name = Mem_Alloc(cls.permanentmempool, strlen(name) + 1);
+       cl_iplog_items[cl_iplog_numitems].address = (char *) Mem_Alloc(cls.permanentmempool, strlen(address) + 1);
+       cl_iplog_items[cl_iplog_numitems].name = (char *) Mem_Alloc(cls.permanentmempool, strlen(name) + 1);
        strlcpy(cl_iplog_items[cl_iplog_numitems].address, address, strlen(address) + 1);
        // TODO: maybe it would be better to strip weird characters from name when
        // copying it here rather than using a straight strcpy?
@@ -2949,6 +2949,7 @@ qboolean CL_ExaminePrintString(const char *text)
 }
 
 extern cvar_t slowmo;
+extern void CSQC_UpdateNetworkTimes(double newtime, double oldtime);
 static void CL_NetworkTimeReceived(double newtime)
 {
        double timehigh;
@@ -3026,6 +3027,8 @@ static void CL_NetworkTimeReceived(double newtime)
        cl.fixangle[0] = false;
        if (!cls.demoplayback)
                VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
+       // update the csqc's server timestamps, critical for proper sync
+       CSQC_UpdateNetworkTimes(cl.mtime[0], cl.mtime[1]);
 }
 
 #define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf("%3i:%s(%i)\n", msg_readcount-1, x, cmd);