logarithm

[xonotic/darkplaces.git] / clvm_cmds.c

diff --git a/clvm_cmds.c b/clvm_cmds.c
index 71cbb33ad624c8acdc7bfa0fa9a8a558f934e278..82d63a16dd317bfeee17e42c8d426b2115c19f7f 100644 (file)
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -1479,6 +1479,7 @@ static void VM_CL_makestatic (void)
                if (staticent->render.effects & EF_DOUBLESIDED)
                        staticent->render.flags |= RENDER_DOUBLESIDED;
 
+               staticent->render.allowdecals = true;
                CL_UpdateRenderEntity(&staticent->render);
        }
        else
@@ -2273,11 +2274,12 @@ void CL_GetEntityMatrix (prvm_edict_t *ent, matrix4x4_t *out, qboolean viewmatri
        }
 }
 
-
 int CL_GetEntityLocalTagMatrix(prvm_edict_t *ent, int tagindex, matrix4x4_t *out)
 {
        int frame;
+       int ret;
        dp_model_t *model;
+       entity_render_t cheatentity;
        if (tagindex >= 0
         && (model = CL_GetModelFromEdict(ent))
         && model->animscenes)
@@ -2286,7 +2288,15 @@ int CL_GetEntityLocalTagMatrix(prvm_edict_t *ent, int tagindex, matrix4x4_t *out
                frame = (int)ent->fields.client->frame;
                if (frame < 0 || frame >= model->numframes)
                        frame = 0;
-               return Mod_Alias_GetTagMatrix(model, model->animscenes[frame].firstframe, tagindex, out);
+               // now we'll do some CHEATING
+               memset(&cheatentity, 0, sizeof(cheatentity));
+               cheatentity.model = model;
+               CL_LoadFrameGroupBlend(ent, &cheatentity);
+               R_LerpAnimation(&cheatentity);
+               ret = CL_BlendTagMatrix(&cheatentity, tagindex, out);
+               if(ret)
+                       *out = identitymatrix;
+               return ret;
        }
        *out = identitymatrix;
        return 0;
@@ -4181,7 +4191,7 @@ VM_CL_SpawnParticleDelayed,               // #528 float(vector org, vector vel, float delay,
 VM_loadfromdata,                               // #529
 VM_loadfromfile,                               // #530
 NULL,                                                  // #531
-NULL,                                                  // #532
+VM_log,                                                        // #532
 NULL,                                                  // #533
 NULL,                                                  // #534
 NULL,                                                  // #535