From 357800c627e2e5c8b0638e48ea2d5bbe215482a9 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 31 Dec 2012 13:25:24 +0100 Subject: [PATCH] get rid of Draw_Not --- qcsrc/client/vehicles/vehicles.qc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/qcsrc/client/vehicles/vehicles.qc b/qcsrc/client/vehicles/vehicles.qc index 1c8c3c483..f18488c4e 100644 --- a/qcsrc/client/vehicles/vehicles.qc +++ b/qcsrc/client/vehicles/vehicles.qc @@ -41,7 +41,6 @@ void CSQC_BUMBLE_GUN_HUD(); #define MAX_AXH 4 entity AuxiliaryXhair[MAX_AXH]; -var void Draw_Not(); .string axh_image; .float axh_fadetime; @@ -84,7 +83,7 @@ void AuxiliaryXhair_Draw2D() } if(time - self.cnt > self.axh_fadetime) - self.draw2d = Draw_Not; + self.draw2d = func_null; } void Net_AuXair2(float bIsNew) @@ -95,7 +94,7 @@ void Net_AuXair2(float bIsNew) if(axh == world || wasfreed(axh)) // MADNESS? THIS IS QQQQCCCCCCCCC (wasfreed, why do you exsist?) { axh = spawn(); - axh.draw2d = Draw_Not; + axh.draw2d = func_null; axh.drawmask = MASK_NORMAL; axh.axh_drawflag = DRAWFLAG_ADDITIVE; axh.axh_fadetime = 0.1; @@ -148,7 +147,7 @@ void Net_VehicleSetup() remove(axh); axh = spawn(); - axh.draw2d = Draw_Not; + axh.draw2d = func_null; axh.drawmask = MASK_NORMAL; axh.axh_drawflag = DRAWFLAG_NORMAL; axh.axh_fadetime = 0.1; @@ -327,7 +326,7 @@ void CSQC_BUMBLE_HUD() drawresetcliparea(); // Right gunner slot occupied? - if(AuxiliaryXhair[1].draw2d == Draw_Not) + if(!AuxiliaryXhair[1].draw2d) { shield = (picsize_x * 0.5) - (0.5 * stringwidth(_("No right gunner!"), FALSE, '1 0 0' * picsize_y + '0 1 0' * picsize_y)); drawfill(hudloc + picloc - '0.2 0.2 0', picsize + '0.4 0.4 0', '0.25 0.25 0.25', 0.75, DRAWFLAG_NORMAL); @@ -349,7 +348,7 @@ void CSQC_BUMBLE_HUD() drawpic(hudloc + picloc, hud_ammo2_bar, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); drawresetcliparea(); // Left gunner slot occupied? - if(AuxiliaryXhair[2].draw2d == Draw_Not) + if(!AuxiliaryXhair[2].draw2d) { shield = (picsize_x * 0.5) - (0.5 * stringwidth(_("No left gunner!"), FALSE, '1 0 0' * picsize_y + '0 1 0' * picsize_y)); drawfill(hudloc + picloc - '0.2 0.2 0', picsize + '0.4 0.4 0', '0.25 0.25 0.25', 0.75, DRAWFLAG_NORMAL); -- 2.39.2