From: terencehill <piuntn@gmail.com>
Date: Tue, 9 Feb 2016 18:52:52 +0000 (+0100)
Subject: Partially revert commit 9f5aad709 "Fix weaponmodel effects passing through warpzones... 
X-Git-Tag: xonotic-v0.8.2~1190^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a61e2b11c8a0d69e51b2942ce90177bd80919e37;p=xonotic%2Fxonotic-data.pk3dir.git

Partially revert commit 9f5aad709 "Fix weaponmodel effects passing through warpzones": anticipate drawing only viewmodel
---

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index ea0257fda..3a27b19d7 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -347,7 +347,6 @@ entity viewmodel;
 STATIC_INIT(viewmodel) {
     viewmodel = new(viewmodel);
     make_pure(viewmodel);
-	viewmodel.draw = viewmodel_draw;
 }
 
 entity porto;
@@ -1666,7 +1665,7 @@ void CSQC_UpdateView(float w, float h)
 
 	// run viewmodel_draw before updating view_angles to the angles calculated by WarpZone_FixView
 	// viewmodel_draw needs to use the view_angles set by the engine on every CSQC_UpdateView call
-	FOREACH_ENTITY(it.draw, LAMBDA(it.draw(it)));
+	viewmodel_draw(viewmodel);
 
 	// Render the Scene
 	view_origin = getpropertyvec(VF_ORIGIN);
@@ -1848,6 +1847,8 @@ void CSQC_UpdateView(float w, float h)
 	   mousepos = mousepos*0.5 + getmousepos();
 	 */
 
+	FOREACH_ENTITY(it.draw, LAMBDA(it.draw(it)));
+
 	addentities(MASK_NORMAL | MASK_ENGINE | MASK_ENGINEVIEWMODELS);
 	renderscene();