Fix compilation with gmqcc.

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / item.c

diff --git a/qcsrc/menu/item.c b/qcsrc/menu/item.c
index 32d1e4c653d77e80669e09a9273f849b3e328c92..d055b1a051d535dbfd18736751eb2357c25003a0 100644 (file)
--- a/qcsrc/menu/item.c
+++ b/qcsrc/menu/item.c
@@ -47,14 +47,37 @@ void Item_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOr
 float autocvar_menu_showboxes;
 void Item_draw(entity me)
 {
-       if(autocvar_menu_showboxes < 0)
+       if(autocvar_menu_showboxes)
        {
-               draw_Fill('0 0 0', '0.5 0.5 0', '1 0 1', -autocvar_menu_showboxes);
-               draw_Fill('0.5 0.5 0', '0.5 0.5 0', '1 0 1', -autocvar_menu_showboxes);
-       }
-       if(autocvar_menu_showboxes > 0)
-       {
-               draw_Fill('0 0 0', '1 1 0', '1 0 1', autocvar_menu_showboxes);
+               vector rgb = '1 0 1';
+               float a = fabs(autocvar_menu_showboxes);
+
+               // don't draw containers and border images
+               if(me.instanceOfContainer || me.instanceOfBorderImage)
+               {
+                       rgb = '0 0 0';
+                       a = 0;
+               }
+
+#if 0
+               // hack to detect multi drawing
+               float r = random() * 3;
+               if(r >= 2)
+                       rgb = '1 0 0';
+               else if(r >= 1)
+                       rgb = '0 1 0';
+               else
+                       rgb = '0 0 1';
+#endif
+               if(autocvar_menu_showboxes < 0)
+               {
+                       draw_Fill('0 0 0', '0.5 0.5 0', rgb, a);
+                       draw_Fill('0.5 0.5 0', '0.5 0.5 0', rgb, a);
+               }
+               if(autocvar_menu_showboxes > 0)
+               {
+                       draw_Fill('0 0 0', '1 1 0', rgb, a);
+               }
        }
 }