forbid world writes after precache stage (without using sv.state, instead prog->allow...

[xonotic/darkplaces.git] / r_lerpanim.c

diff --git a/r_lerpanim.c b/r_lerpanim.c
index 7e44e373f3e3bd7f1d082ef6b88608548e4b93e8..831a16e42380f33b4323cd66d4819bd7077527bc 100644 (file)
--- a/r_lerpanim.c
+++ b/r_lerpanim.c
@@ -6,53 +6,52 @@
 // LordHavoc: later note: made FRAMEBLENDINSERT macro
 void R_LerpAnimation(entity_render_t *r)
 {
-       int sub1, sub2, numframes, f, i, data;
+       int sub1, sub2, numframes, f, i;
        double sublerp, lerp, d;
-       animscene_t *scene, *scenes;
+       animscene_t *scene;
        frameblend_t *blend;
+
+       if (!r->model || !r->model->type)
+               return;
+
        blend = r->frameblend;
 
        numframes = r->model->numframes;
 
-       if ((r->frame1 >= numframes))
+       if (r->frame1 >= numframes)
        {
-               Con_Printf ("CL_LerpAnimation: no such frame %d\n", r->frame1);
+               Con_DPrintf("CL_LerpAnimation: no such frame %d\n", r->frame1);
                r->frame1 = 0;
        }
 
-       if ((r->frame2 >= numframes))
+       if (r->frame2 >= numframes)
        {
-               Con_Printf ("CL_LerpAnimation: no such frame %d\n", r->frame2);
+               Con_DPrintf("CL_LerpAnimation: no such frame %d\n", r->frame2);
                r->frame2 = 0;
        }
 
        // note: this could be removed, if the rendering code allows an empty blend array
        if (r->frame1 < 0)
-               Host_Error ("CL_LerpAnimation: frame1 is NULL\n");
+       {
+               Con_Printf ("CL_LerpAnimation: frame1 is NULL\n");
+               r->frame1 = 0;
+       }
 
-       // round off very close blend percentages
-       if (r->framelerp < (1.0f / 65536.0f))
-               r->framelerp = 0;
-       if (r->framelerp >= (65535.0f / 65536.0f))
+       // check r_lerpmodels and round off very close blend percentages
+       if (!r_lerpmodels.integer)
                r->framelerp = 1;
+       else if (r->framelerp >= (65535.0f / 65536.0f))
+               r->framelerp = 1;
+       else if (r->framelerp < (1.0f / 65536.0f))
+               r->framelerp = 0;
 
-       blend[0].frame = blend[1].frame = blend[2].frame = blend[3].frame = -1;
+       blend[0].frame = blend[1].frame = blend[2].frame = blend[3].frame = 0;
        blend[0].lerp = blend[1].lerp = blend[2].lerp = blend[3].lerp = 0;
-       if (r->model->ofs_scenes)
+       if (r->model->animscenes)
        {
-               if (r->model->cachesize)
-               {
-                       data = (int) Mod_Extradata(r->model);
-                       if (!data)
-                               Host_Error("CL_LerpAnimation: model not loaded\n");
-                       scenes = (animscene_t *) (r->model->ofs_scenes + data);
-               }
-               else
-                       scenes = (animscene_t *) r->model->ofs_scenes;
-
                if (r->framelerp < 1 && r->frame1 >= 0)
                {
-                       scene = scenes + r->frame1;
+                       scene = r->model->animscenes + r->frame1;
                        lerp = 1 - r->framelerp;
 
                        if (scene->framecount > 1)
@@ -61,20 +60,19 @@ void R_LerpAnimation(entity_render_t *r)
                                sub1 = (int) (sublerp);
                                sub2 = sub1 + 1;
                                sublerp -= sub1;
-                               if (sublerp < (1.0f / 65536.0f))
-                                       sublerp = 0;
-                               if (sublerp >= (65535.0f / 65536.0f))
+                               if (!r_lerpmodels.integer)
+                                       sublerp = 1;
+                               else if (sublerp >= (65535.0f / 65536.0f))
                                        sublerp = 1;
+                               else if (sublerp < (1.0f / 65536.0f))
+                                       sublerp = 0;
                                if (scene->loop)
                                {
-                                       sub1 = (sub1 % scene->framecount) + scene->firstframe;
-                                       sub2 = (sub2 % scene->framecount) + scene->firstframe;
-                               }
-                               else
-                               {
-                                       sub1 = bound(0, sub1, (scene->framecount - 1)) + scene->firstframe;
-                                       sub2 = bound(0, sub2, (scene->framecount - 1)) + scene->firstframe;
+                                       sub1 = (sub1 % scene->framecount);
+                                       sub2 = (sub2 % scene->framecount);
                                }
+                               sub1 = bound(0, sub1, (scene->framecount - 1)) + scene->firstframe;
+                               sub2 = bound(0, sub2, (scene->framecount - 1)) + scene->firstframe;
                                f = sub1;
                                d = (1 - sublerp) * lerp;
 #define FRAMEBLENDINSERT\
@@ -108,7 +106,7 @@ void R_LerpAnimation(entity_render_t *r)
                }
                if (r->framelerp > 0 && r->frame2 >= 0)
                {
-                       scene = scenes + r->frame2;
+                       scene = r->model->animscenes + r->frame2;
                        lerp = r->framelerp;
 
                        if (scene->framecount > 1)
@@ -117,20 +115,19 @@ void R_LerpAnimation(entity_render_t *r)
                                sub1 = (int) (sublerp);
                                sub2 = sub1 + 1;
                                sublerp -= sub1;
-                               if (sublerp < (1.0f / 65536.0f))
-                                       sublerp = 0;
-                               if (sublerp >= (65535.0f / 65536.0f))
+                               if (!r_lerpmodels.integer)
+                                       sublerp = 1;
+                               else if (sublerp >= (65535.0f / 65536.0f))
                                        sublerp = 1;
+                               else if (sublerp < (1.0f / 65536.0f))
+                                       sublerp = 0;
                                if (scene->loop)
                                {
-                                       sub1 = (sub1 % scene->framecount) + scene->firstframe;
-                                       sub2 = (sub2 % scene->framecount) + scene->firstframe;
-                               }
-                               else
-                               {
-                                       sub1 = bound(0, sub1, (scene->framecount - 1)) + scene->firstframe;
-                                       sub2 = bound(0, sub2, (scene->framecount - 1)) + scene->firstframe;
+                                       sub1 = (sub1 % scene->framecount);
+                                       sub2 = (sub2 % scene->framecount);
                                }
+                               sub1 = bound(0, sub1, (scene->framecount - 1)) + scene->firstframe;
+                               sub2 = bound(0, sub2, (scene->framecount - 1)) + scene->firstframe;
                                f = sub1;
                                d = (1 - sublerp) * lerp;
                                FRAMEBLENDINSERT