If the new Key_Event breaks anything for you, you can set #if 0 and activate the old

[xonotic/darkplaces.git] / cl_main.c

diff --git a/cl_main.c b/cl_main.c
index 29fad13afb76c56232b6620a4a0b1ee11f08fc83..268a05fa5134bf339ebe85a6920f620e925b081d 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -333,7 +333,7 @@ static void CL_PrintEntities_f(void)
                        strcpy(name, "--no model--");
                for (j = strlen(name);j < 25;j++)
                        name[j] = ' ';
-               Con_Printf("%3i: %s:%04i (%5i %5i %5i) [%3i %3i %3i] %4.2f %5.3f\n", i, name, ent->render.frame, (int) ent->render.origin[0], (int) ent->render.origin[1], (int) ent->render.origin[2], (int) ent->render.angles[0] % 360, (int) ent->render.angles[1] % 360, (int) ent->render.angles[2] % 360, ent->render.scale, ent->render.alpha);
+               Con_Printf("%3i: %s:%4i (%5i %5i %5i) [%3i %3i %3i] %4.2f %5.3f\n", i, name, ent->render.frame, (int) ent->render.origin[0], (int) ent->render.origin[1], (int) ent->render.origin[2], (int) ent->render.angles[0] % 360, (int) ent->render.angles[1] % 360, (int) ent->render.angles[2] % 360, ent->render.scale, ent->render.alpha);
        }
 }
 
@@ -587,7 +587,7 @@ void CL_LinkNetworkEntity(entity_t *e)
                        e->render.colormap = -1; // no special coloring
                e->render.skinnum = e->state_current.skin;
                VectorScale(e->state_current.colormod, (1.0f / 32.0f), e->render.colormod);
-               if (e->render.flags & RENDER_VIEWMODEL)
+               if (e->render.flags & RENDER_VIEWMODEL && !e->state_current.tagentity)
                {
                        if (!r_drawviewmodel.integer || chase_active.integer || envmap)
                                return;
@@ -641,7 +641,7 @@ void CL_LinkNetworkEntity(entity_t *e)
                // if it's the player entity, update according to client movement
                if (e == cl_entities + cl.playerentity && cl.movement)
                {
-                       lerp = (cl.time - cl.mtime[0]) / (cl.mtime[0] - cl.mtime[1]);
+                       lerp = (cl.time - cl.mtime[1]) / (cl.mtime[0] - cl.mtime[1]);
                        lerp = bound(0, lerp, 1);
                        VectorLerp(cl.movement_oldorigin, lerp, cl.movement_origin, origin);
                        VectorSet(angles, 0, cl.viewangles[1], 0);
@@ -718,9 +718,19 @@ void CL_LinkNetworkEntity(entity_t *e)
                CL_BoundingBoxForEntity(&e->render);
 
                // handle effects now that we know where this entity is in the world...
-               origin[0] = e->render.matrix.m[0][3];
-               origin[1] = e->render.matrix.m[1][3];
-               origin[2] = e->render.matrix.m[2][3];
+               if (e->render.model && e->render.model->soundfromcenter)
+               {
+                       // bmodels are treated specially since their origin is usually '0 0 0'
+                       vec3_t o;
+                       VectorMAM(0.5f, e->render.model->normalmins, 0.5f, e->render.model->normalmaxs, o);
+                       Matrix4x4_Transform(&e->render.matrix, o, origin);
+               }
+               else
+               {
+                       origin[0] = e->render.matrix.m[0][3];
+                       origin[1] = e->render.matrix.m[1][3];
+                       origin[2] = e->render.matrix.m[2][3];
+               }
                trailtype = -1;
                dlightradius = 0;
                dlightcolor[0] = 0;
@@ -1287,9 +1297,6 @@ CL_SendCmd
 void CL_UpdatePrydonCursor(void);
 void CL_SendCmd(void)
 {
-       if (cls.signon == SIGNONS)
-               CL_UpdatePrydonCursor();
-
        if (cls.demoplayback)
        {
                SZ_Clear(&cls.message);