X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=view.c;h=4b46ffc44709a28701bda82d9b45979eb0dfacf5;hp=b3fdf9096ac1dac6ee02acb348b31245045fb366;hb=d874e839b0a5b5942b03b11232f23bc06978433b;hpb=7e1ac1e0df1ef15a3813b5cee9830996c960fc62

diff --git a/view.c b/view.c
index b3fdf909..4b46ffc4 100644
--- a/view.c
+++ b/view.c
@@ -532,7 +532,15 @@ void V_CalcRefdef (void)
 
 		r_refdef.vieworg[2] += cl.viewheight + bob;
 
+		// LordHavoc: origin view kick added
+		if (!intimerefresh)
+		{
+			VectorAdd(r_refdef.viewangles, cl.punchangle, r_refdef.viewangles);
+			VectorAdd(r_refdef.vieworg, cl.punchvector, r_refdef.vieworg);
+		}
+
 		// set up gun
+		// (FIXME! this should be in cl_main.c with the other linking code, not view.c!)
 		view->state_current.modelindex = cl.stats[STAT_WEAPON];
 		view->state_current.frame = cl.stats[STAT_WEAPONFRAME];
 		VectorCopy(r_refdef.vieworg, view->render.origin);
@@ -550,15 +558,9 @@ void V_CalcRefdef (void)
 		view->render.effects = ent->render.effects;
 		view->render.scale = 1.0 / 3.0;
 
-		// LordHavoc: origin view kick added
-		if (!intimerefresh)
-		{
-			VectorAdd(r_refdef.viewangles, cl.punchangle, r_refdef.viewangles);
-			VectorAdd(r_refdef.vieworg, cl.punchvector, r_refdef.vieworg);
-		}
-
-		// copy to refdef
-		r_refdef.viewent = view->render;
+		// link into render entities list
+		if (r_refdef.numentities < r_refdef.maxentities && r_drawviewmodel.integer && !chase_active.integer && !envmap && r_drawentities.integer && !(cl.items & IT_INVISIBILITY) && cl.stats[STAT_HEALTH] > 0 && view->render.model != NULL)
+			r_refdef.entities[r_refdef.numentities++] = &view->render;
 	}
 }