Merge branch 'terencehill/lms_itemtimes_fix' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / view.qc

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 790f92926fa8fb0dc20cd05ea5be93f77157f664..4eab4c5c551d2b9dcfffc41a2ec21bd662e60260 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -864,7 +864,7 @@ void HUD_Crosshair()
 {SELFPARAM();
        static float rainbow_last_flicker;
        static vector rainbow_prev_color;
-       entity e = self;
+       entity e = this;
        float f, i, j;
        vector v;
        if(!scoreboard_active && !camera_active && intermission != 2 &&
@@ -1404,8 +1404,8 @@ void CSQC_UpdateView(float w, float h)
        else
                view_quality = 1;
 
-       button_attack2 = PHYS_INPUT_BUTTON_ATCK2(self);
-       button_zoom = PHYS_INPUT_BUTTON_ZOOM(self);
+       button_attack2 = PHYS_INPUT_BUTTON_ATCK2(this);
+       button_zoom = PHYS_INPUT_BUTTON_ZOOM(this);
 
        vf_size = getpropertyvec(VF_SIZE);
        vf_min = getpropertyvec(VF_MIN);
@@ -1839,7 +1839,7 @@ void CSQC_UpdateView(float w, float h)
           mousepos = mousepos*0.5 + getmousepos();
         */
 
-       FOREACH_ENTITY(it.draw, it.draw(it));
+       FOREACH_ENTITY(it.draw, LAMBDA(it.draw(it)));
 
        addentities(MASK_NORMAL | MASK_ENGINE | MASK_ENGINEVIEWMODELS);
        renderscene();
@@ -2169,7 +2169,7 @@ void CSQC_UpdateView(float w, float h)
          } else */
 
        // draw 2D entities
-       FOREACH_ENTITY(it.draw2d, it.draw2d(it));
+       FOREACH_ENTITY(it.draw2d, LAMBDA(it.draw2d(it)));
        Draw_ShowNames_All();
        Debug_Draw();