whitespace

[xonotic/darkplaces.git] / cl_parse.c

diff --git a/cl_parse.c b/cl_parse.c
index b33a23d79294976accaed6ede7ca3dcd15ad43d9..9d74bae28e81b6b1497d2782cc812bea8f8b9800 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -220,22 +220,20 @@ void CL_KeepaliveMessage (void)
 
 void CL_ParseEntityLump(char *entdata)
 {
-       char *data;
+       const char *data;
        char key[128], value[4096];
        FOG_clear(); // LordHavoc: no fog until set
        R_SetSkyBox(""); // LordHavoc: no environment mapped sky until set
        data = entdata;
        if (!data)
                return;
-       data = COM_Parse(data);
-       if (!data)
+       if (!COM_ParseToken(&data))
                return; // error
        if (com_token[0] != '{')
                return; // error
        while (1)
        {
-               data = COM_Parse(data);
-               if (!data)
+               if (!COM_ParseToken(&data))
                        return; // error
                if (com_token[0] == '}')
                        break; // end of worldspawn
@@ -245,8 +243,7 @@ void CL_ParseEntityLump(char *entdata)
                        strcpy(key, com_token);
                while (key[strlen(key)-1] == ' ') // remove trailing spaces
                        key[strlen(key)-1] = 0;
-               data = COM_Parse(data);
-               if (!data)
+               if (!COM_ParseToken(&data))
                        return; // error
                strcpy(value, com_token);
                if (!strcmp("sky", key))
@@ -388,6 +385,9 @@ void CL_ParseServerInfo (void)
 
        Mod_ClearUsed();
 
+       // disable until we get textures for it
+       R_ResetSkyBox();
+
 // precache models
        memset (cl.model_precache, 0, sizeof(cl.model_precache));
        for (nummodels=1 ; ; nummodels++)
@@ -434,11 +434,10 @@ void CL_ParseServerInfo (void)
        {
                // LordHavoc: i == 1 means the first model is the world model
                cl.model_precache[i] = Mod_ForName (model_precache[i], false, false, i == 1);
-
                if (cl.model_precache[i] == NULL)
                {
-                       Host_Error("Model %s not found\n", model_precache[i]);
-                       return;
+                       Con_Printf("Model %s not found\n", model_precache[i]);
+                       //return;
                }
                CL_KeepaliveMessage ();
        }
@@ -458,20 +457,19 @@ void CL_ParseServerInfo (void)
        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);
+       CL_BoundingBoxForEntity(&ent->render);
        // clear entlife array
        memset(entlife, 0, MAX_EDICTS);
 
        cl_num_entities = 1;
 
        R_NewMap ();
-
        CL_CGVM_Start();
 
+       noclip_anglehack = false;               // noclip is turned off at start
+
        Mem_CheckSentinelsGlobal();
 
-       noclip_anglehack = false;               // noclip is turned off at start
 }
 
 void CL_ValidateState(entity_state_t *s)
@@ -916,23 +914,7 @@ void CL_ParseStatic (int large)
        VectorCopy (ent->state_baseline.origin, ent->render.origin);
        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);
-       }
+       CL_BoundingBoxForEntity(&ent->render);
 
        // This is definitely cheating...
        if (ent->render.model == NULL)