]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - cl_parse.c
removed fxmesa support (3dfx svgalib) because no one used it to my knowledge, and...
[xonotic/darkplaces.git] / cl_parse.c
index 4719d72673ee43277f6fdd591c91b8386839700b..896ddf0e251fbf0d1d17d0131a222fae552f0b51 100644 (file)
@@ -48,11 +48,11 @@ char *svc_strings[128] =
        "svc_updatecolors",     // [byte] [byte]
        "svc_particle",         // [vec3] <variable>
        "svc_damage",                   // [byte] impact [byte] blood [vec3] from
-       
+
        "svc_spawnstatic",
        "OBSOLETE svc_spawnbinary",
        "svc_spawnbaseline",
-       
+
        "svc_temp_entity",              // <variable>
        "svc_setpause",
        "svc_signonnum",
@@ -80,10 +80,16 @@ char *svc_strings[128] =
        "", // 47
        "", // 48
        "", // 49
-       "", // 50
-       "svc_fog", // 51
-       "svc_effect", // [vector] org [byte] modelindex [byte] startframe [byte] framecount [byte] framerate
-       "svc_effect2", // [vector] org [short] modelindex [short] startframe [byte] framecount [byte] framerate
+       "svc_cgame", //                         50              // [short] length [bytes] data
+       "svc_unusedlh1", //                     51              // unused
+       "svc_effect", //                        52              // [vector] org [byte] modelindex [byte] startframe [byte] framecount [byte] framerate
+       "svc_effect2", //                       53              // [vector] org [short] modelindex [short] startframe [byte] framecount [byte] framerate
+       "svc_sound2", //                        54              // short soundindex instead of byte
+       "svc_spawnbaseline2", //        55              // short modelindex instead of byte
+       "svc_spawnstatic2", //          56              // short modelindex instead of byte
+       "svc_entities", //                      57              // [int] deltaframe [int] thisframe [float vector] eye [variable length] entitydata
+       "svc_unusedlh3", //                     58
+       "svc_spawnstaticsound2", //     59              // [coord3] [short] samp [byte] vol [byte] aten
 };
 
 //=============================================================================
@@ -99,36 +105,7 @@ void CL_Parse_Init(void)
 }
 
 qboolean Nehahrademcompatibility; // LordHavoc: to allow playback of the early Nehahra movie segments
-qboolean dpprotocol; // LordHavoc: whether or not the current network stream is the enhanced DarkPlaces protocol
-
-/*
-===============
-CL_EntityNum
-
-This error checks and tracks the total number of entities
-===============
-*/
-entity_t       *CL_EntityNum (int num)
-{
-       /*
-       if (num >= cl.num_entities)
-       {
-               if (num >= MAX_EDICTS)
-                       Host_Error ("CL_EntityNum: %i is an invalid number",num);
-               cl.num_entities = num;
-//             while (cl.num_entities <= num)
-//             {
-//                     cl_entities[cl.num_entities].colormap = -1; // no special coloring
-//                     cl.num_entities++;
-//             }
-       }
-       */
-       if (num >= MAX_EDICTS)
-               Host_Error ("CL_EntityNum: %i is an invalid number",num);
-               
-       return &cl_entities[num];
-}
-
+int dpprotocol; // LordHavoc: version of network protocol, or 0 if not DarkPlaces
 
 /*
 ==================
@@ -145,7 +122,7 @@ void CL_ParseStartSoundPacket(int largesoundindex)
     float      attenuation;
        int             i;
                   
-    field_mask = MSG_ReadByte(); 
+    field_mask = MSG_ReadByte();
 
     if (field_mask & SND_VOLUME)
                volume = MSG_ReadByte ();
@@ -176,7 +153,7 @@ void CL_ParseStartSoundPacket(int largesoundindex)
                pos[i] = MSG_ReadCoord ();
 
     S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation);
-}       
+}
 
 /*
 ==================
@@ -191,8 +168,9 @@ void CL_KeepaliveMessage (void)
        float   time;
        static float lastmsg;
        int             ret;
+       int             c;
        sizebuf_t       old;
-       byte            olddata[8192];
+       qbyte           olddata[8192];
        
        if (sv.active)
                return;         // no need if server is local
@@ -209,14 +187,15 @@ void CL_KeepaliveMessage (void)
                switch (ret)
                {
                default:
-                       Host_Error ("CL_KeepaliveMessage: CL_GetMessage failed");               
+                       Host_Error ("CL_KeepaliveMessage: CL_GetMessage failed");
                case 0:
                        break;  // nothing waiting
                case 1:
                        Host_Error ("CL_KeepaliveMessage: received a message");
                        break;
                case 2:
-                       if (MSG_ReadByte() != svc_nop)
+                       c = MSG_ReadByte();
+                       if (c != svc_nop)
                                Host_Error ("CL_KeepaliveMessage: datagram wasn't a nop");
                        break;
                }
@@ -298,7 +277,7 @@ An svc_signonnum has been received, perform a client side setup
 */
 static void CL_SignonReply (void)
 {
-       char    str[8192];
+       //char  str[8192];
 
 Con_DPrintf ("CL_SignonReply: %i\n", cls.signon);
 
@@ -323,8 +302,9 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon);
                }
 
                MSG_WriteByte (&cls.message, clc_stringcmd);
-               sprintf (str, "spawn %s", cls.spawnparms);
-               MSG_WriteString (&cls.message, str);
+               //sprintf (str, "spawn %s", cls.spawnparms);
+               //MSG_WriteString (&cls.message, str);
+               MSG_WriteString (&cls.message, "spawn");
                break;
 
        case 3:
@@ -333,7 +313,6 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon);
                break;
 
        case 4:
-//             SCR_EndLoadingPlaque ();                // allow normal screen updates
                Con_ClearNotify();
                break;
        }
@@ -344,13 +323,15 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon);
 CL_ParseServerInfo
 ==================
 */
+qbyte entlife[MAX_EDICTS];
 void CL_ParseServerInfo (void)
 {
-       char    *str;
-       int             i;
-       int             nummodels, numsounds;
-       char    model_precache[MAX_MODELS][MAX_QPATH];
-       char    sound_precache[MAX_SOUNDS][MAX_QPATH];
+       char *str;
+       int i;
+       int nummodels, numsounds;
+       char model_precache[MAX_MODELS][MAX_QPATH];
+       char sound_precache[MAX_SOUNDS][MAX_QPATH];
+       entity_t *ent;
 
        Con_DPrintf ("Serverinfo packet received.\n");
 //
@@ -360,9 +341,9 @@ void CL_ParseServerInfo (void)
 
 // parse protocol version number
        i = MSG_ReadLong ();
-       if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION && i != 250)
+       if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250)
        {
-               Con_Printf ("Server returned version %i, not %i or %i", i, DPPROTOCOL_VERSION, PROTOCOL_VERSION);
+               Con_Printf ("Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION);
                return;
        }
        Nehahrademcompatibility = false;
@@ -370,7 +351,9 @@ void CL_ParseServerInfo (void)
                Nehahrademcompatibility = true;
        if (cls.demoplayback && demo_nehahra.integer)
                Nehahrademcompatibility = true;
-       dpprotocol = i == DPPROTOCOL_VERSION;
+       dpprotocol = i;
+       if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3)
+               dpprotocol = 0;
 
 // parse maxclients
        cl.maxclients = MSG_ReadByte ();
@@ -447,8 +430,6 @@ void CL_ParseServerInfo (void)
 // now we try to load everything else until a cache allocation fails
 //
 
-       Mem_CheckSentinelsGlobal();
-
        for (i=1 ; i<nummodels ; i++)
        {
                // LordHavoc: i == 1 means the first model is the world model
@@ -462,24 +443,29 @@ void CL_ParseServerInfo (void)
                CL_KeepaliveMessage ();
        }
 
-       Mem_CheckSentinelsGlobal();
-
        S_BeginPrecaching ();
        for (i=1 ; i<numsounds ; i++)
        {
-               cl.sound_precache[i] = S_PrecacheSound (sound_precache[i]);
+               cl.sound_precache[i] = S_PrecacheSound (sound_precache[i], true);
                CL_KeepaliveMessage ();
        }
        S_EndPrecaching ();
 
 // local state
-       cl_entities[0].render.model = cl.worldmodel = cl.model_precache[1];
-       cl_entities[0].render.scale = 1;
-       cl_entities[0].render.alpha = 1;
+       ent = &cl_entities[0];
+       // entire entity array was cleared, so just fill in a few fields
+       ent->state_current.active = true;
+       ent->render.model = cl.worldmodel = cl.model_precache[1];
+       ent->render.scale = 1;
+       ent->render.alpha = 1;
+       VectorAdd(ent->render.origin, ent->render.model->normalmins, ent->render.mins);
+       VectorAdd(ent->render.origin, ent->render.model->normalmaxs, ent->render.maxs);
+       // clear entlife array
+       memset(entlife, 0, MAX_EDICTS);
 
-       R_NewMap ();
+       cl_num_entities = 1;
 
-       Mem_CheckSentinelsGlobal();
+       R_NewMap ();
 
        CL_CGVM_Start();
 
@@ -506,12 +492,12 @@ void CL_ValidateState(entity_state_t *s)
        Mod_CheckLoaded(model);
        if (model && s->frame >= model->numframes)
        {
-               Con_Printf("CL_ValidateState: no such frame %i in \"%s\"\n", s->frame, model->name);
+               Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\"\n", s->frame, model->name);
                s->frame = 0;
        }
        if (model && s->skin > 0 && s->skin >= model->numskins)
        {
-               Con_Printf("CL_ValidateState: no such skin %i in \"%s\"\n", s->skin, model->name);
+               Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\"\n", s->skin, model->name);
                s->skin = 0;
        }
 }
@@ -525,20 +511,13 @@ If an entities model or origin changes from frame to frame, it must be
 relinked.  Other attributes can change without relinking.
 ==================
 */
-byte entkill[MAX_EDICTS];
 int bitprofile[32], bitprofilecount = 0;
 void CL_ParseUpdate (int bits)
 {
-       int i, num, deltadie;
+       int i, num;
        entity_t *ent;
        entity_state_t new;
 
-       if (cls.signon == SIGNONS - 1)
-       {       // first update is the final signon stage
-               cls.signon = SIGNONS;
-               CL_SignonReply ();
-       }
-
        if (bits & U_MOREBITS)
                bits |= (MSG_ReadByte()<<8);
        if ((bits & U_EXTEND1) && (!Nehahrademcompatibility))
@@ -558,30 +537,27 @@ void CL_ParseUpdate (int bits)
        if (num < 1)
                Host_Error("CL_ParseUpdate: invalid entity number (%i)\n", num);
 
-       // mark as visible (no kill)
-       entkill[num] = 0;
-
-       ent = CL_EntityNum (num);
+       ent = cl_entities + num;
 
        for (i = 0;i < 32;i++)
                if (bits & (1 << i))
                        bitprofile[i]++;
        bitprofilecount++;
 
-       deltadie = false;
+       // note: this inherits the 'active' state of the baseline chosen
+       // (state_baseline is always active, state_current may not be active if
+       // the entity was missing in the last frame)
        if (bits & U_DELTA)
-       {
                new = ent->state_current;
-               if (!new.active)
-                       deltadie = true; // was not present in previous frame, leave hidden until next full update
-       }
        else
+       {
                new = ent->state_baseline;
+               new.active = true;
+       }
 
+       new.number = num;
        new.time = cl.mtime[0];
-
        new.flags = 0;
-       new.active = true;
        if (bits & U_MODEL)             new.modelindex = (new.modelindex & 0xFF00) | MSG_ReadByte();
        if (bits & U_FRAME)             new.frame = (new.frame & 0xFF00) | MSG_ReadByte();
        if (bits & U_COLORMAP)  new.colormap = MSG_ReadByte();
@@ -599,12 +575,8 @@ void CL_ParseUpdate (int bits)
        if (bits & U_EFFECTS2)  new.effects = (new.effects & 0x00FF) | (MSG_ReadByte() << 8);
        if (bits & U_GLOWSIZE)  new.glowsize = MSG_ReadByte();
        if (bits & U_GLOWCOLOR) new.glowcolor = MSG_ReadByte();
-#if 0
-       if (bits & U_COLORMOD)  {int i = MSG_ReadByte();float r = (((int) i >> 5) & 7) * 1.0 / 7, g = (((int) i >> 2) & 7) * 1.0 / 7, b = ((int) i & 3) * 1.0 / 3;Con_Printf("warning: U_COLORMOD %i (%1.2f %1.2f %1.2f) ignored\n", i, r, g, b);}
-#else
        // apparently the dpcrush demo uses this (unintended, and it uses white anyway)
        if (bits & U_COLORMOD)  MSG_ReadByte();
-#endif
        if (bits & U_GLOWTRAIL) new.flags |= RENDER_GLOWTRAIL;
        if (bits & U_FRAME2)    new.frame = (new.frame & 0x00FF) | (MSG_ReadByte() << 8);
        if (bits & U_MODEL2)    new.modelindex = (new.modelindex & 0x00FF) | (MSG_ReadByte() << 8);
@@ -619,7 +591,8 @@ void CL_ParseUpdate (int bits)
                int j = MSG_ReadFloat() * 255.0f;
                if (i == 2)
                {
-                       if (MSG_ReadFloat())
+                       i = MSG_ReadFloat();
+                       if (i)
                                new.effects |= EF_FULLBRIGHT;
                }
                if (j < 0)
@@ -630,12 +603,7 @@ void CL_ParseUpdate (int bits)
                        new.alpha = j;
        }
 
-       if (deltadie)
-       {
-               // hide the entity
-               new.active = false;
-       }
-       else
+       if (new.active)
                CL_ValidateState(&new);
 
        if (new.flags & RENDER_STEP) // FIXME: rename this flag?
@@ -658,6 +626,34 @@ void CL_ParseUpdate (int bits)
                ent->state_previous = ent->state_current;
                ent->state_current = new;
        }
+       if (ent->state_current.active)
+       {
+               cl_entities_active[ent->state_current.number] = true;
+               // mark as visible (no kill this frame)
+               entlife[ent->state_current.number] = 2;
+       }
+}
+
+void CL_ReadEntityFrame(void)
+{
+       entity_t *ent;
+       entity_frame_t entityframe;
+       int i;
+       EntityFrame_Read(&cl.entitydatabase);
+       EntityFrame_FetchFrame(&cl.entitydatabase, EntityFrame_MostRecentlyRecievedFrameNum(&cl.entitydatabase), &entityframe);
+       for (i = 0;i < entityframe.numentities;i++)
+       {
+               // copy the states
+               ent = &cl_entities[entityframe.entitydata[i].number];
+               ent->state_previous = ent->state_current;
+               ent->state_current = entityframe.entitydata[i];
+               ent->state_current.time = cl.mtime[0];
+               // the entity lives again...
+               entlife[ent->state_current.number] = 2;
+               cl_entities_active[ent->state_current.number] = true;
+       }
+       VectorCopy(cl.viewentoriginnew, cl.viewentoriginold);
+       VectorCopy(entityframe.eye, cl.viewentoriginnew);
 }
 
 char *bitprofilenames[32] =
@@ -702,8 +698,7 @@ void CL_BitProfile_f(void)
        Con_Printf("bitprofile: %i updates\n");
        if (bitprofilecount)
                for (i = 0;i < 32;i++)
-//                     if (bitprofile[i])
-                               Con_Printf("%s: %i %3.2f%%\n", bitprofilenames[i], bitprofile[i], bitprofile[i] * 100.0 / bitprofilecount);
+                       Con_Printf("%s: %i %3.2f%%\n", bitprofilenames[i], bitprofile[i], bitprofile[i] * 100.0 / bitprofilecount);
        Con_Printf("\n");
        for (i = 0;i < 32;i++)
                bitprofile[i] = 0;
@@ -712,15 +707,24 @@ void CL_BitProfile_f(void)
 
 void CL_EntityUpdateSetup(void)
 {
-       memset(entkill, 1, MAX_EDICTS);
 }
 
 void CL_EntityUpdateEnd(void)
 {
        int i;
+       // disable entities that disappeared this frame
        for (i = 1;i < MAX_EDICTS;i++)
-               if (entkill[i])
-                       cl_entities[i].state_previous.active = cl_entities[i].state_current.active = 0;
+       {
+               // clear only the entities that were active last frame but not this
+               // frame, don't waste time clearing all entities (which would cause
+               // cache misses)
+               if (entlife[i])
+               {
+                       entlife[i]--;
+                       if (!entlife[i])
+                               cl_entities[i].state_previous.active = cl_entities[i].state_current.active = 0;
+               }
+       }
 }
 
 /*
@@ -787,7 +791,7 @@ void CL_ParseClientdata (int bits)
                cl.idealpitch = MSG_ReadChar ();
        else
                cl.idealpitch = 0;
-       
+
        VectorCopy (cl.mvelocity[0], cl.mvelocity[1]);
        for (i=0 ; i<3 ; i++)
        {
@@ -801,7 +805,7 @@ void CL_ParseClientdata (int bits)
                else
                        cl.punchangle[i] = 0;
                if (bits & (SU_PUNCHVEC1<<i))
-                       cl.punchvector[i] = MSG_ReadFloatCoord();
+                       cl.punchvector[i] = MSG_ReadCoord();
                else
                        cl.punchvector[i] = 0;
                if (bits & (SU_VELOCITY1<<i) )
@@ -818,7 +822,7 @@ void CL_ParseClientdata (int bits)
                                cl.item_gettime[j] = cl.time;
                cl.items = i;
        }
-               
+
        cl.onground = (bits & SU_ONGROUND) != 0;
        cl.inwater = (bits & SU_INWATER) != 0;
 
@@ -839,6 +843,18 @@ void CL_ParseClientdata (int bits)
                cl.stats[STAT_ACTIVEWEAPON] = (1<<i);
        else
                cl.stats[STAT_ACTIVEWEAPON] = i;
+
+       cl.viewzoomold = cl.viewzoomnew; // for interpolation
+       if (bits & SU_VIEWZOOM)
+       {
+               i = MSG_ReadByte();
+               if (i < 2)
+                       i = 2;
+               cl.viewzoomnew = (float) i * (1.0f / 255.0f);
+       }
+       else
+               cl.viewzoomnew = 1;
+
 }
 
 /*
@@ -850,9 +866,9 @@ void CL_ParseStatic (int large)
 {
        entity_t *ent;
 
-       if (cl.num_statics >= MAX_STATIC_ENTITIES)
+       if (cl_num_static_entities >= cl_max_static_entities)
                Host_Error ("Too many static entities");
-       ent = &cl_static_entities[cl.num_statics++];
+       ent = &cl_static_entities[cl_num_static_entities++];
        CL_ParseBaseline (ent, large);
 
 // copy it to the current state
@@ -869,7 +885,29 @@ void CL_ParseStatic (int large)
        ent->render.alpha = 1;
 
        VectorCopy (ent->state_baseline.origin, ent->render.origin);
-       VectorCopy (ent->state_baseline.angles, ent->render.angles);    
+       VectorCopy (ent->state_baseline.angles, ent->render.angles);
+
+       if (ent->render.angles[0] || ent->render.angles[2])
+       {
+               // pitch or roll
+               VectorAdd(ent->render.origin, ent->render.model->rotatedmins, ent->render.mins);
+               VectorAdd(ent->render.origin, ent->render.model->rotatedmaxs, ent->render.maxs);
+       }
+       else if (ent->render.angles[1])
+       {
+               // yaw
+               VectorAdd(ent->render.origin, ent->render.model->yawmins, ent->render.mins);
+               VectorAdd(ent->render.origin, ent->render.model->yawmaxs, ent->render.maxs);
+       }
+       else
+       {
+               VectorAdd(ent->render.origin, ent->render.model->normalmins, ent->render.mins);
+               VectorAdd(ent->render.origin, ent->render.model->normalmaxs, ent->render.maxs);
+       }
+
+       // This is definitely cheating...
+       if (ent->render.model == NULL)
+               cl_num_static_entities--;
 }
 
 /*
@@ -889,7 +927,7 @@ void CL_ParseStaticSound (int large)
                sound_num = MSG_ReadByte ();
        vol = MSG_ReadByte ();
        atten = MSG_ReadByte ();
-       
+
        S_StaticSound (cl.sound_precache[sound_num], org, vol, atten);
 }
 
@@ -924,7 +962,7 @@ void CL_ParseEffect2 (void)
 
 #define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf ("%3i:%s\n", msg_readcount-1, x);
 
-static byte cgamenetbuffer[65536];
+static qbyte cgamenetbuffer[65536];
 
 /*
 =====================
@@ -935,10 +973,10 @@ void CL_ParseServerMessage (void)
 {
        int                     cmd;
        int                     i, entitiesupdated;
-       byte            cmdlog[32];
+       qbyte           cmdlog[32];
        char            *cmdlogname[32], *temp;
        int                     cmdindex, cmdcount = 0;
-       
+
 //
 // if recording demos, copy the message out
 //
@@ -946,16 +984,15 @@ void CL_ParseServerMessage (void)
                Con_Printf ("%i ",net_message.cursize);
        else if (cl_shownet.integer == 2)
                Con_Printf ("------------------\n");
-       
-       cl.onground = false;    // unless the server says otherwise     
+
+       cl.onground = false;    // unless the server says otherwise
 //
 // parse the message
 //
        MSG_BeginReading ();
 
        entitiesupdated = false;
-       CL_EntityUpdateSetup();
-       
+
        while (1)
        {
                if (msg_badread)
@@ -980,6 +1017,12 @@ void CL_ParseServerMessage (void)
                        temp = "entity";
                        cmdlogname[cmdindex] = temp;
                        SHOWNET("fast update");
+                       if (cls.signon == SIGNONS - 1)
+                       {
+                               // first update is the final signon stage
+                               cls.signon = SIGNONS;
+                               CL_SignonReply ();
+                       }
                        CL_ParseUpdate (cmd&127);
                        continue;
                }
@@ -1021,12 +1064,16 @@ void CL_ParseServerMessage (void)
                        break;
 
                case svc_nop:
-//                     Con_Printf ("svc_nop\n");
                        break;
 
                case svc_time:
-                       // handle old protocols which do not have entity update ranges
-                       entitiesupdated = true;
+                       if (!entitiesupdated)
+                       {
+                               // this is a new frame, we'll be seeing entities,
+                               // so prepare for entity updates
+                               CL_EntityUpdateSetup();
+                               entitiesupdated = true;
+                       }
                        cl.mtime[1] = cl.mtime[0];
                        cl.mtime[0] = MSG_ReadFloat ();
                        break;
@@ -1038,16 +1085,18 @@ void CL_ParseServerMessage (void)
 
                case svc_version:
                        i = MSG_ReadLong ();
-                       if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION && i != 250)
-                               Host_Error ("CL_ParseServerMessage: Server is protocol %i, not %i or %i", i, DPPROTOCOL_VERSION, PROTOCOL_VERSION);
+                       if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250)
+                               Host_Error ("CL_ParseServerMessage: Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION);
                        Nehahrademcompatibility = false;
                        if (i == 250)
                                Nehahrademcompatibility = true;
                        if (cls.demoplayback && demo_nehahra.integer)
                                Nehahrademcompatibility = true;
-                       dpprotocol = i == DPPROTOCOL_VERSION;
+                       dpprotocol = i;
+                       if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3)
+                               dpprotocol = 0;
                        break;
-                       
+
                case svc_disconnect:
                        Host_EndGame ("Server disconnected\n");
 
@@ -1069,18 +1118,20 @@ void CL_ParseServerMessage (void)
 
                case svc_serverinfo:
                        CL_ParseServerInfo ();
-//                     vid.recalc_refdef = true;       // leave intermission full screen
                        break;
-                       
+
                case svc_setangle:
                        for (i=0 ; i<3 ; i++)
                                cl.viewangles[i] = MSG_ReadAngle ();
                        break;
-                       
+
                case svc_setview:
                        cl.viewentity = MSG_ReadShort ();
+                       // LordHavoc: assume first setview recieved is the real player entity
+                       if (!cl.playerentity)
+                               cl.playerentity = cl.viewentity;
                        break;
-                                       
+
                case svc_lightstyle:
                        i = MSG_ReadByte ();
                        if (i >= MAX_LIGHTSTYLES)
@@ -1106,24 +1157,27 @@ void CL_ParseServerMessage (void)
                case svc_updatename:
                        i = MSG_ReadByte ();
                        if (i >= cl.maxclients)
-                               Host_Error ("CL_ParseServerMessage: svc_updatename >= MAX_SCOREBOARD");
+                               Host_Error ("CL_ParseServerMessage: svc_updatename >= cl.maxclients");
                        strcpy (cl.scores[i].name, MSG_ReadString ());
                        break;
 
                case svc_updatefrags:
                        i = MSG_ReadByte ();
                        if (i >= cl.maxclients)
-                               Host_Error ("CL_ParseServerMessage: svc_updatefrags >= MAX_SCOREBOARD");
+                               Host_Error ("CL_ParseServerMessage: svc_updatefrags >= cl.maxclients");
                        cl.scores[i].frags = MSG_ReadShort ();
-                       break;                  
+                       break;
 
                case svc_updatecolors:
                        i = MSG_ReadByte ();
                        if (i >= cl.maxclients)
-                               Host_Error ("CL_ParseServerMessage: svc_updatecolors >= MAX_SCOREBOARD");
+                               Host_Error ("CL_ParseServerMessage: svc_updatecolors >= cl.maxclients");
                        cl.scores[i].colors = MSG_ReadByte ();
+                       // update our color cvar if our color changed
+                       if (i == cl.playerentity - 1)
+                               Cvar_SetValue ("_cl_color", cl.scores[i].colors);
                        break;
-                       
+
                case svc_particle:
                        CL_ParseParticleEffect ();
                        break;
@@ -1138,13 +1192,15 @@ void CL_ParseServerMessage (void)
 
                case svc_spawnbaseline:
                        i = MSG_ReadShort ();
-                       // must use CL_EntityNum() to force cl.num_entities up
-                       CL_ParseBaseline (CL_EntityNum(i), false);
+                       if (i < 0 || i >= MAX_EDICTS)
+                               Host_Error ("CL_ParseServerMessage: svc_spawnbaseline: invalid entity number %i", i);
+                       CL_ParseBaseline (cl_entities + i, false);
                        break;
                case svc_spawnbaseline2:
                        i = MSG_ReadShort ();
-                       // must use CL_EntityNum() to force cl.num_entities up
-                       CL_ParseBaseline (CL_EntityNum(i), true);
+                       if (i < 0 || i >= MAX_EDICTS)
+                               Host_Error ("CL_ParseServerMessage: svc_spawnbaseline2: invalid entity number %i", i);
+                       CL_ParseBaseline (cl_entities + i, true);
                        break;
                case svc_spawnstatic:
                        CL_ParseStatic (false);
@@ -1163,7 +1219,7 @@ void CL_ParseServerMessage (void)
                        else
                                CDAudio_Resume ();
                        break;
-                       
+
                case svc_signonnum:
                        i = MSG_ReadByte ();
                        if (i <= cls.signon)
@@ -1199,29 +1255,26 @@ void CL_ParseServerMessage (void)
                        cl.cdtrack = MSG_ReadByte ();
                        cl.looptrack = MSG_ReadByte ();
                        if ( (cls.demoplayback || cls.demorecording) && (cls.forcetrack != -1) )
-                               CDAudio_Play ((byte)cls.forcetrack, true);
+                               CDAudio_Play ((qbyte)cls.forcetrack, true);
                        else
-                               CDAudio_Play ((byte)cl.cdtrack, true);
+                               CDAudio_Play ((qbyte)cl.cdtrack, true);
                        break;
 
                case svc_intermission:
                        cl.intermission = 1;
                        cl.completed_time = cl.time;
-//                     vid.recalc_refdef = true;       // go to full screen
                        break;
 
                case svc_finale:
                        cl.intermission = 2;
                        cl.completed_time = cl.time;
-//                     vid.recalc_refdef = true;       // go to full screen
                        SCR_CenterPrint (MSG_ReadString ());
                        break;
 
                case svc_cutscene:
                        cl.intermission = 3;
                        cl.completed_time = cl.time;
-//                     vid.recalc_refdef = true;       // go to full screen
-                       SCR_CenterPrint (MSG_ReadString ());                    
+                       SCR_CenterPrint (MSG_ReadString ());
                        break;
 
                case svc_sellscreen:
@@ -1240,24 +1293,25 @@ void CL_ParseServerMessage (void)
                        {
                                int length;
                                length = (int) ((unsigned short) MSG_ReadShort());
-                               /*
-                               if (cgamenetbuffersize < length)
-                               {
-                                       cgamenetbuffersize = length;
-                                       if (cgamenetbuffer)
-                                               Mem_Free(cgamenetbuffer);
-                                       cgamenetbuffer = Mem_Alloc(cgamenetbuffersize);
-                               }
-                               */
                                for (i = 0;i < length;i++)
                                        cgamenetbuffer[i] = MSG_ReadByte();
                                if (!msg_badread)
                                        CL_CGVM_ParseNetwork(cgamenetbuffer, length);
                        }
                        break;
+               case svc_entities:
+                       if (cls.signon == SIGNONS - 1)
+                       {
+                               // first update is the final signon stage
+                               cls.signon = SIGNONS;
+                               CL_SignonReply ();
+                       }
+                       CL_ReadEntityFrame();
+                       break;
                }
        }
 
        if (entitiesupdated)
                CL_EntityUpdateEnd();
 }
+