Partially revert commit 9f5aad709 "Fix weaponmodel effects passing through warpzones...

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index ea0257fdaf6191344ea82a9702fc3f8a9671ca35..3a27b19d79befefbe859bb3735735439d8a12414 100644 (file)
--- 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();