Lots of speedups and cleanups in client code, dynamically allocated cl_entities ...

[xonotic/darkplaces.git] / cl_parse.c

diff --git a/cl_parse.c b/cl_parse.c
index 8f4df288cbade2e92119fc7ccb8fd7e66c5be686..5837a1cfac431c7b3582011f6de3ecd9cb9db9ae 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -116,19 +116,6 @@ 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);
                
@@ -306,7 +293,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);
 
@@ -331,8 +318,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:
@@ -341,7 +329,6 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon);
                break;
 
        case 4:
-               SCR_EndLoadingPlaque ();                // allow normal screen updates
                Con_ClearNotify();
                break;
        }
@@ -354,11 +341,12 @@ CL_ParseServerInfo
 */
 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");
 //
@@ -473,15 +461,37 @@ void CL_ParseServerInfo (void)
        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];
+       memset(ent, 0, sizeof(entity_t));
+       ent->render.model = cl.worldmodel = cl.model_precache[1];
+       ent->render.scale = 1;
+       ent->render.alpha = 1;
+
+       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);
+       }
+
+       cl_num_entities = 1;
 
        R_NewMap ();
 
@@ -597,12 +607,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);
@@ -722,8 +728,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;
@@ -882,9 +887,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
@@ -901,7 +906,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--;
 }
 
 /*
@@ -1058,7 +1085,6 @@ void CL_ParseServerMessage (void)
                        break;
 
                case svc_nop:
-//                     Con_Printf ("svc_nop\n");
                        break;
 
                case svc_time:
@@ -1108,7 +1134,6 @@ void CL_ParseServerMessage (void)
 
                case svc_serverinfo:
                        CL_ParseServerInfo ();
-//                     vid.recalc_refdef = true;       // leave intermission full screen
                        break;
 
                case svc_setangle:
@@ -1246,20 +1271,17 @@ void CL_ParseServerMessage (void)
                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 ());
                        break;
 
@@ -1279,15 +1301,6 @@ 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)
@@ -1308,3 +1321,4 @@ void CL_ParseServerMessage (void)
        if (entitiesupdated)
                CL_EntityUpdateEnd();
 }
+