]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
ignore RENDER_VIEWMODEL if tagentity is set
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 30 May 2005 06:42:41 +0000 (06:42 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 30 May 2005 06:42:41 +0000 (06:42 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5355 d7cf8633-e32d-0410-b094-e92efae38249

cl_main.c

index 00401515687b547ee5cdcb9d50baf2942482e68a..dfca0cf74c7be6c50d8dd2dded54c96a158878a5 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -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;