physics: fix and refactor unsticking

[xonotic/darkplaces.git] / sv_ents5.c

diff --git a/sv_ents5.c b/sv_ents5.c
index 98be9b367a7bde18580f28ae5f88a60b6b0c393d..4ede6d3d04a0d6c412c84ac74cd968694d60060e 100644 (file)
--- a/sv_ents5.c
+++ b/sv_ents5.c
@@ -17,7 +17,7 @@ static double anim_reducetime(double t, double frameduration, double maxtime)
 }
 
 // see VM_SV_frameduration
-static double anim_frameduration(dp_model_t *model, int framenum)
+static double anim_frameduration(model_t *model, int framenum)
 {
        if (!model || !model->animscenes || framenum < 0 || framenum >= model->numframes)
                return 0;
@@ -179,7 +179,7 @@ void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbi
 {
        prvm_prog_t *prog = SVVM_prog;
        unsigned int bits = 0;
-       //dp_model_t *model;
+       //model_t *model;
 
        if (s->active != ACTIVE_NETWORK)
        {
@@ -352,7 +352,7 @@ void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbi
                                }
                                else
                                {
-                                       dp_model_t *model = SV_GetModelByIndex(s->modelindex);
+                                       model_t *model = SV_GetModelByIndex(s->modelindex);
                                        if (s->framegroupblend[3].lerp > 0)
                                        {
                                                MSG_WriteByte(msg, 3);