Combine `SELFCALL` and `SELFCALL_DONE` with `WITH`

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

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index f53dbd6be9270eb46abb4b1773460431711d6331..1e4d666e9cb64c28f2399fb52ebdb5da05d2cf18 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -1467,8 +1467,7 @@ void CSQC_UpdateView(float w, float h)
         */
 
        for(entity e = NULL; (e = nextent(e)); ) if (e.draw) {
-               SELFCALL(e, e.draw());
-               SELFCALL_DONE();
+               WITH(entity, self, e, e.draw());
        }
 
        addentities(MASK_NORMAL | MASK_ENGINE | MASK_ENGINEVIEWMODELS);
@@ -1805,8 +1804,7 @@ void CSQC_UpdateView(float w, float h)
 
        // draw 2D entities
        for (entity e = NULL; (e = nextent(e)); ) if (e.draw2d) {
-               SELFCALL(e, e.draw2d());
-               SELFCALL_DONE();
+               WITH(entity, self, e, e.draw2d());
        }
        Draw_ShowNames_All();