]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
get rid of Draw_Not
authorRudolf Polzer <divverent@xonotic.org>
Mon, 31 Dec 2012 12:25:24 +0000 (13:25 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 31 Dec 2012 12:25:24 +0000 (13:25 +0100)
qcsrc/client/vehicles/vehicles.qc

index 1c8c3c483a3bc031085b77655d462b50ef5855d5..f18488c4ea5106344f55f3ad945dde5eae4dbd77 100644 (file)
@@ -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);