todo item done: now ignores modelflags on view entities and tag attached entities...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3703 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_main.c b/cl_main.c
index 6a1356c66af6e0379c41a38d1cb35774054921c1..5b736f60826d01e62143163a91042faa1d2d3f7e 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -612,7 +612,7 @@ void CL_LinkNetworkEntity(entity_t *e)
                        Mod_CheckLoaded(e->render.model);
                        if (e->render.model->type == mod_alias || e->render.model->type == mod_sprite)
                                angles[0] = -angles[0];
-                       if (e->render.model->flags & EF_ROTATE)
+                       if ((e->render.model->flags & EF_ROTATE) && (!e->state_current.tagentity && !(e->render.flags & RENDER_VIEWMODEL)))
                        {
                                angles[1] = ANGLEMOD(100*cl.time);
                                if (cl_itembobheight.value)
@@ -722,7 +722,7 @@ void CL_LinkNetworkEntity(entity_t *e)
                        e->persistent.muzzleflash -= cl.frametime * 1000;
                }
                // LordHavoc: if the model has no flags, don't check each
-               if (e->render.model && e->render.model->flags)
+               if (e->render.model && e->render.model->flags && (!e->state_current.tagentity && !(e->render.flags & RENDER_VIEWMODEL)))
                {
                        if (e->render.model->flags & EF_GIB)
                                trailtype = 2;

diff --git a/todo b/todo
index c608463d3d838337691ea8634b031d5cf6abe00a..2520875e9d0c974f482a08362d5b41ea999ea871 100644 (file)
--- a/todo
+++ b/todo
@@ -83,9 +83,9 @@ f darkplaces: change particle() macro in cl_particles.c to have a do{}while(0) t
 d darkplaces: fix con_notify (should control number of lines)
 0 darkplaces: fix disappearing viewmodel (and other models) when in an unvised q3bsp, or partially inside a wall in q3bsp
 d darkplaces: fix key based turning being affected by slowmo - it should not be
-0 darkplaces: fix r_drawentities view problem (stops updating r_refdef.vieworg?) (Vic)
-0 darkplaces: fix view blends slightly lingering as time goes on, they should go away completely (Cruaich)
-0 darkplaces: ignore modelflags on view weaponmodel - in Malice the double barreled shotgun leaves a smoke trail, and the hellfire rotates, also in Zerstorer the riot shotgun rotates (Hidayat)
+-n darkplaces: fix r_drawentities view problem (stops updating r_refdef.vieworg?) (Vic)
+-f darkplaces: fix view blends slightly lingering as time goes on, they should go away completely (Cruaich)
+-n darkplaces: ignore modelflags on view weaponmodel - in Malice the double barreled shotgun leaves a smoke trail, and the hellfire rotates, also in Zerstorer the riot shotgun rotates (Hidayat)
 0 darkplaces: increase resolution of particlefont to 512x512 (Chillo)
 0 darkplaces: integrate zinx's psycho.c gamma hack as an easteregg
 0 darkplaces: make Com_HexDumpToConsole not use color