fix strlennocol/strdecolorize on unusual strings like "foo^";

[xonotic/darkplaces.git] / clvm_cmds.c

diff --git a/clvm_cmds.c b/clvm_cmds.c
index f11af64d559bede5462c545c8bb2b2273567c6cd..6e35193ae39de8937a208a2a8e0b2906129999a4 100644 (file)
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -351,8 +351,6 @@ int CSQC_EntitiesInBox (vec3_t mins, vec3_t maxs, int maxlist, prvm_edict_t **li
        {
                if (ent->priv.required->free)
                        continue;
-//             VectorAdd(ent->fields.client->origin, ent->fields.client->mins, ent->fields.client->absmin);
-//             VectorAdd(ent->fields.client->origin, ent->fields.client->maxs, ent->fields.client->absmax);
                if(BoxesOverlap(mins, maxs, ent->fields.client->absmin, ent->fields.client->absmax))
                        list[k++] = ent;
        }
@@ -644,8 +642,6 @@ static void VM_CL_R_AddEntities (void)
                ed = &prog->edicts[i];
                if(ed->priv.required->free)
                        continue;
-               VectorAdd(ed->fields.client->origin, ed->fields.client->mins, ed->fields.client->absmin);
-               VectorAdd(ed->fields.client->origin, ed->fields.client->maxs, ed->fields.client->absmax);
                CSQC_Think(ed);
                if(ed->priv.required->free)
                        continue;
@@ -758,25 +754,13 @@ static void VM_CL_R_SetView (void)
        PRVM_G_FLOAT(OFS_RETURN) = 1;
 }
 
-extern void CL_UpdateNetworkEntity(entity_t *e, int recursionlimit);
 //#304 void() renderscene (EXT_CSQC)
 static void VM_CL_R_RenderScene (void)
 {
-       int i;
        VM_SAFEPARMCOUNT(0, VM_CL_R_RenderScene);
        // we need to update any RENDER_VIEWMODEL entities at this point because
        // csqc supplies its own view matrix
-       for (i = 1;i < cl.num_entities;i++)
-       {
-               if (cl.entities_active[i])
-               {
-                       entity_t *ent = cl.entities + i;
-                       if ((ent->render.flags & RENDER_VIEWMODEL) || ent->state_current.tagentity)
-                               CL_UpdateNetworkEntity(ent, 32);
-               }
-       }
-       // and of course the engine viewmodel needs updating as well
-       CL_UpdateNetworkEntity(&cl.viewent, 32);
+       CL_UpdateViewEntities();
        // now draw stuff!
        R_RenderView();
 }
@@ -3152,7 +3136,7 @@ VM_tan,                                                   // #475 float(float a) VM_tan (DP_QC_ASINACOSATANATAN2TAN)
 VM_strlennocol,                                        // #476 float(string s) : DRESK - String Length (not counting color codes) (DP_QC_STRINGCOLORFUNCTIONS)
 VM_strdecolorize,                              // #477 string(string s) : DRESK - Decolorized String (DP_QC_STRINGCOLORFUNCTIONS)
 VM_strftime,                                   // #478 string(float uselocaltime, string format, ...) (DP_QC_STRFTIME)
-NULL,                                                  // #479
+VM_tokenizebyseparator,                        // #479 float(string s) tokenizebyseparator (DP_QC_TOKENIZEBYSEPARATOR)
 NULL,                                                  // #480
 NULL,                                                  // #481
 NULL,                                                  // #482