patch from VorteX that makes GAME_DELUXEQUAKE mode reset a cvar in the

[xonotic/darkplaces.git] / cl_parse.c

diff --git a/cl_parse.c b/cl_parse.c
index 83322bd3cc193580c0558e2f885f5509be19df12..9c5411552949fba24d8d726a99b72668cd28976a 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -184,6 +184,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);
 
 /*
 ==================
@@ -244,7 +245,7 @@ void CL_ParseStartSoundPacket(int largesoundindex)
                        channel &= 7;
                }
 
-               if (largesoundindex || field_mask & SND_LARGESOUND)
+               if (largesoundindex || (field_mask & SND_LARGESOUND) || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3)
                        sound_num = (unsigned short) MSG_ReadShort ();
                else
                        sound_num = MSG_ReadByte ();
@@ -267,7 +268,8 @@ void CL_ParseStartSoundPacket(int largesoundindex)
        if (ent >= cl.max_entities)
                CL_ExpandEntities(ent);
 
-       S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0f, attenuation);
+       if( !CL_VM_Event_Sound(sound_num, volume / 255.0f, channel, attenuation, ent, pos) )
+               S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0f, attenuation);
 }
 
 /*
@@ -334,13 +336,13 @@ void CL_ParseEntityLump(char *entdata)
        data = entdata;
        if (!data)
                return;
-       if (!COM_ParseToken_Simple(&data, false))
+       if (!COM_ParseToken_Simple(&data, false, false))
                return; // error
        if (com_token[0] != '{')
                return; // error
        while (1)
        {
-               if (!COM_ParseToken_Simple(&data, false))
+               if (!COM_ParseToken_Simple(&data, false, false))
                        return; // error
                if (com_token[0] == '}')
                        break; // end of worldspawn
@@ -350,7 +352,7 @@ void CL_ParseEntityLump(char *entdata)
                        strlcpy (key, com_token, sizeof (key));
                while (key[strlen(key)-1] == ' ') // remove trailing spaces
                        key[strlen(key)-1] = 0;
-               if (!COM_ParseToken_Simple(&data, false))
+               if (!COM_ParseToken_Simple(&data, false, false))
                        return; // error
                strlcpy (value, com_token, sizeof (value));
                if (!strcmp("sky", key))
@@ -1378,6 +1380,8 @@ static void CL_SignonReply (void)
 
        case 4:
                Con_ClearNotify();
+               if (COM_CheckParm("-profilegameonly"))
+                       Sys_AllowProfiling(true);
                break;
        }
 }
@@ -1736,6 +1740,11 @@ void CL_ParseBaseline (entity_t *ent, int large)
                ent->state_baseline.modelindex = (unsigned short) MSG_ReadShort ();
                ent->state_baseline.frame = (unsigned short) MSG_ReadShort ();
        }
+       else if (cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3)
+       {
+               ent->state_baseline.modelindex = (unsigned short) MSG_ReadShort ();
+               ent->state_baseline.frame = MSG_ReadByte ();
+       }
        else
        {
                ent->state_baseline.modelindex = MSG_ReadByte ();
@@ -1768,7 +1777,7 @@ void CL_ParseClientdata (void)
        VectorCopy (cl.mvelocity[0], cl.mvelocity[1]);
        cl.mviewzoom[1] = cl.mviewzoom[0];
 
-       if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4 || cls.protocol == PROTOCOL_DARKPLACES5)
+       if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3 || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4 || cls.protocol == PROTOCOL_DARKPLACES5)
        {
                cl.stats[STAT_VIEWHEIGHT] = DEFAULT_VIEWHEIGHT;
                cl.stats[STAT_ITEMS] = 0;
@@ -1802,7 +1811,7 @@ void CL_ParseClientdata (void)
        {
                if (bits & (SU_PUNCH1<<i) )
                {
-                       if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE)
+                       if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3)
                                cl.mpunchangle[0][i] = MSG_ReadChar();
                        else
                                cl.mpunchangle[0][i] = MSG_ReadAngle16i();
@@ -1816,7 +1825,7 @@ void CL_ParseClientdata (void)
                }
                if (bits & (SU_VELOCITY1<<i) )
                {
-                       if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4)
+                       if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3 || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4)
                                cl.mvelocity[0][i] = MSG_ReadChar()*16;
                        else
                                cl.mvelocity[0][i] = MSG_ReadCoord32f();
@@ -1824,7 +1833,7 @@ void CL_ParseClientdata (void)
        }
 
        // LordHavoc: hipnotic demos don't have this bit set but should
-       if (bits & SU_ITEMS || cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4 || cls.protocol == PROTOCOL_DARKPLACES5)
+       if (bits & SU_ITEMS || cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3 || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4 || cls.protocol == PROTOCOL_DARKPLACES5)
                cl.stats[STAT_ITEMS] = MSG_ReadLong ();
 
        cl.onground = (bits & SU_ONGROUND) != 0;
@@ -1843,11 +1852,14 @@ void CL_ParseClientdata (void)
                cl.stats[STAT_CELLS] = MSG_ReadShort();
                cl.stats[STAT_ACTIVEWEAPON] = (unsigned short) MSG_ReadShort ();
        }
-       else if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4)
+       else if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3 || cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3 || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4)
        {
                cl.stats[STAT_WEAPONFRAME] = (bits & SU_WEAPONFRAME) ? MSG_ReadByte() : 0;
                cl.stats[STAT_ARMOR] = (bits & SU_ARMOR) ? MSG_ReadByte() : 0;
-               cl.stats[STAT_WEAPON] = (bits & SU_WEAPON) ? MSG_ReadByte() : 0;
+               if (cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3)
+                       cl.stats[STAT_WEAPON] = (bits & SU_WEAPON) ? (unsigned short)MSG_ReadShort() : 0;
+               else
+                       cl.stats[STAT_WEAPON] = (bits & SU_WEAPON) ? MSG_ReadByte() : 0;
                cl.stats[STAT_HEALTH] = MSG_ReadShort();
                cl.stats[STAT_AMMO] = MSG_ReadByte();
                cl.stats[STAT_SHELLS] = MSG_ReadByte();
@@ -1923,7 +1935,7 @@ void CL_ParseStaticSound (int large)
        int                     sound_num, vol, atten;
 
        MSG_ReadVector(org, cls.protocol);
-       if (large)
+       if (large || cls.protocol == PROTOCOL_NEHAHRABJP2)
                sound_num = (unsigned short) MSG_ReadShort ();
        else
                sound_num = MSG_ReadByte ();
@@ -2503,7 +2515,7 @@ void CL_ParseTempEntity(void)
                        colorStart = MSG_ReadByte();
                        colorLength = MSG_ReadByte();
                        CL_ParticleExplosion2(pos, colorStart, colorLength);
-                       tempcolor = (unsigned char *)&palette_complete[(rand()%colorLength) + colorStart];
+                       tempcolor = palette_rgb[(rand()%colorLength) + colorStart];
                        color[0] = tempcolor[0] * (2.0f / 255.0f);
                        color[1] = tempcolor[1] * (2.0f / 255.0f);
                        color[2] = tempcolor[2] * (2.0f / 255.0f);
@@ -2886,7 +2898,7 @@ static void CL_NetworkTimeReceived(double newtime)
        if (cls.timedemo || (cl.islocalgame && !sv_fixedframeratesingleplayer.integer) || cl.mtime[1] == cl.mtime[0] || cls.signon < SIGNONS)
                cl.time = cl.mtime[1] = newtime;
        else if (cls.demoplayback)
-       {       
+       {
                // when time falls behind during demo playback it means the cl.mtime[1] was altered
                // due to a large time gap, so treat it as an instant change in time
                // (this can also happen during heavy packet loss in the demo)
@@ -2981,6 +2993,7 @@ void CL_ParseServerMessage(void)
        unsigned char           cmdlog[32];
        char            *cmdlogname[32], *temp;
        int                     cmdindex, cmdcount = 0;
+       qboolean        qwplayerupdatereceived;
 
        // LordHavoc: moved demo message writing from before the packet parse to
        // after the packet parse so that CL_Stop_f can be called by cl_autodemo
@@ -3012,10 +3025,6 @@ void CL_ParseServerMessage(void)
        {
                CL_NetworkTimeReceived(realtime); // qw has no clock
 
-               // slightly kill qw player entities each frame
-               for (i = 1;i < cl.maxclients;i++)
-                       cl.entities_active[i] = false;
-
                // kill all qw nails
                cl.qw_num_nails = 0;
 
@@ -3024,6 +3033,8 @@ void CL_ParseServerMessage(void)
 
                cls.servermovesequence = cls.netcon->qw.incoming_sequence;
 
+               qwplayerupdatereceived = false;
+
                while (1)
                {
                        if (msg_badread)
@@ -3286,6 +3297,14 @@ void CL_ParseServerMessage(void)
                                break;
 
                        case qw_svc_playerinfo:
+                               // slightly kill qw player entities now that we know there is
+                               // an update of player entities this frame...
+                               if (!qwplayerupdatereceived)
+                               {
+                                       qwplayerupdatereceived = true;
+                                       for (i = 1;i < cl.maxclients;i++)
+                                               cl.entities_active[i] = false;
+                               }
                                EntityStateQW_ReadPlayerUpdate();
                                break;
 
@@ -3343,24 +3362,13 @@ void CL_ParseServerMessage(void)
                        }
                }
 
-               // fully kill the still slightly dead qw player entities each frame,
-               // but only if a player update was received
-               for (i = 1;i <= cl.maxclients;i++)
-                       if (cl.entities_active[i])
-                               break;
-               if (i <= cl.maxclients)
+               if (qwplayerupdatereceived)
                {
-                       // kill all non-updated entities this frame
+                       // fully kill any player entities that were not updated this frame
                        for (i = 1;i <= cl.maxclients;i++)
                                if (!cl.entities_active[i])
                                        cl.entities[i].state_current.active = false;
                }
-               else
-               {
-                       // no update this frame, restore the cl.entities_active for good measure
-                       for (i = 1;i <= cl.maxclients;i++)
-                               cl.entities_active[i] = cl.entities[i].state_current.active;
-               }
        }
        else
        {