use dynamic eye position-centered bouncegrid when rendering in dynamic

[xonotic/darkplaces.git] / cl_parse.c

diff --git a/cl_parse.c b/cl_parse.c
index eacfa7bf97aac3d628fbe0d884ebc13e6ad5f9f1..dd9f550420347e45551e55c1326e47324ffa6e2f 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -1909,11 +1909,14 @@ void CL_ValidateState(entity_state_t *s)
        if (!(s->flags & RENDER_COLORMAPPED) && s->colormap > cl.maxclients)
                Con_DPrintf("CL_ValidateState: colormap (%i) > cl.maxclients (%i)\n", s->colormap, cl.maxclients);
 
-       model = CL_GetModelByIndex(s->modelindex);
-       if (model && model->type && s->frame >= model->numframes)
-               Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\" (which has %i frames)\n", s->frame, model->name, model->numframes);
-       if (model && model->type && s->skin > 0 && s->skin >= model->numskins && !(s->lightpflags & PFLAGS_FULLDYNAMIC))
-               Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\" (which has %i skins)\n", s->skin, model->name, model->numskins);
+       if (developer_extra.integer)
+       {
+               model = CL_GetModelByIndex(s->modelindex);
+               if (model && model->type && s->frame >= model->numframes)
+                       Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\" (which has %i frames)\n", s->frame, model->name, model->numframes);
+               if (model && model->type && s->skin > 0 && s->skin >= model->numskins && !(s->lightpflags & PFLAGS_FULLDYNAMIC))
+                       Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\" (which has %i skins)\n", s->skin, model->name, model->numskins);
+       }
 }
 
 void CL_MoveLerpEntityStates(entity_t *ent)
@@ -2016,6 +2019,16 @@ void CL_MoveLerpEntityStates(entity_t *ent)
        // trigger muzzleflash effect if necessary
        if (ent->state_current.effects & EF_MUZZLEFLASH)
                ent->persistent.muzzleflash = 1;
+
+       // restart animation bit
+       if ((ent->state_previous.effects & EF_RESTARTANIM_BIT) != (ent->state_current.effects & EF_RESTARTANIM_BIT))
+       {
+               ent->render.framegroupblend[1] = ent->render.framegroupblend[0];
+               ent->render.framegroupblend[1].lerp = 1;
+               ent->render.framegroupblend[0].frame = ent->state_current.frame;
+               ent->render.framegroupblend[0].start = cl.time;
+               ent->render.framegroupblend[0].lerp = 0;
+       }
 }
 
 /*
@@ -4079,7 +4092,7 @@ void CL_ParseServerMessage(void)
                                        MSG_ReadCoord(cls.protocol);
                                        MSG_ReadCoord(cls.protocol);
                                        MSG_ReadCoord(cls.protocol);
-                                       MSG_ReadByte();
+                                       (void) MSG_ReadByte();
                                        MSG_ReadLong();
                                        MSG_ReadLong();
                                        MSG_ReadString();
@@ -4094,7 +4107,7 @@ void CL_ParseServerMessage(void)
                                        MSG_ReadCoord(cls.protocol);
                                        MSG_ReadCoord(cls.protocol);
                                        MSG_ReadCoord(cls.protocol);
-                                       MSG_ReadByte();
+                                       (void) MSG_ReadByte();
                                        MSG_ReadString();
                                }
                                else