]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/client/hud.qc
Fix quickmenu command "Send private message to" adding a space in the beginning of...
[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud.qc
index 08703095c3d2420efe2604c71287984854b03335..74eeff1ac903d1cb36b37038ad376bf31d73a71e 100644 (file)
@@ -2030,14 +2030,14 @@ void HUD_Radar_Show_Maximized(bool doshow,float clickable)
 {
        hud_panel_radar_maximized = doshow;
        hud_panel_radar_temp_hidden = 0;
-       
+
        if ( doshow )
        {
                if (clickable)
                {
                        if(autocvar_hud_cursormode)
                                setcursormode(1);
-                       hud_panel_radar_mouse = 1; 
+                       hud_panel_radar_mouse = 1;
                }
        }
        else if ( hud_panel_radar_mouse )
@@ -2057,7 +2057,7 @@ void HUD_Radar_Hide_Maximized()
 
 float HUD_Radar_InputEvent(float bInputType, float nPrimary, float nSecondary)
 {
-       if(!hud_panel_radar_maximized || !hud_panel_radar_mouse || 
+       if(!hud_panel_radar_maximized || !hud_panel_radar_mouse ||
                autocvar__hud_configure || mv_active)
                return false;
 
@@ -2099,7 +2099,7 @@ float HUD_Radar_InputEvent(float bInputType, float nPrimary, float nSecondary)
                        if(nPrimary == stof(argv(i)))
                                return false;
                }
-               
+
                if ( getstati(STAT_HEALTH) <= 0 )
                {
                        // Show scoreboard
@@ -2119,7 +2119,7 @@ float HUD_Radar_InputEvent(float bInputType, float nPrimary, float nSecondary)
                }
                else if ( bInputType == 0 )
                        HUD_Radar_Hide_Maximized();
-               
+
                return false;
        }
 
@@ -2130,19 +2130,19 @@ void HUD_Radar_Mouse()
 {
        if ( !hud_panel_radar_mouse ) return;
        if(mv_active) return;
-       
+
        if ( intermission )
        {
                HUD_Radar_Hide_Maximized();
                return;
        }
-       
+
        if(mouseClicked & S_MOUSE2)
        {
                HUD_Radar_Hide_Maximized();
                return;
        }
-       
+
        if(!autocvar_hud_cursormode)
        {
                mousepos = mousepos + getmousepos() * autocvar_menu_mouse_speed;
@@ -2152,14 +2152,14 @@ void HUD_Radar_Mouse()
        }
 
        HUD_Panel_UpdateCvars();
-       
-       
+
+
        panel_size = autocvar_hud_panel_radar_maximized_size;
        panel_size_x = bound(0.2, panel_size_x, 1) * vid_conwidth;
        panel_size_y = bound(0.2, panel_size_y, 1) * vid_conheight;
        panel_pos_x = (vid_conwidth - panel_size_x) / 2;
        panel_pos_y = (vid_conheight - panel_size_y) / 2;
-               
+
        if(mouseClicked & S_MOUSE1)
        {
                // click outside
@@ -2171,11 +2171,11 @@ void HUD_Radar_Mouse()
                }
                vector pos = teamradar_texcoord_to_3dcoord(teamradar_2dcoord_to_texcoord(mousepos),view_origin_z);
                localcmd(sprintf("cmd ons_spawn %f %f %f",pos_x,pos_y,pos_z));
-               
+
                HUD_Radar_Hide_Maximized();
                return;
        }
-       
+
 
        const vector cursor_size = '32 32 0';
        drawpic(mousepos-'8 4 0', strcat("gfx/menu/", autocvar_menu_skin, "/cursor.tga"), cursor_size, '1 1 1', 0.8, DRAWFLAG_NORMAL);
@@ -2390,7 +2390,7 @@ void HUD_Radar(void)
        drawresetcliparea();
 
        if ( hud_panel_radar_mouse )
-       {                       
+       {
                string message = "Click to select teleport destination";
 
                if ( getstati(STAT_HEALTH) <= 0 )
@@ -4813,250 +4813,15 @@ void HUD_CenterPrint (void)
        }
 }
 
-// ItemsTime (#XX)
-//
-const float ITEMSTIME_MAXITEMS = 10;
-float ItemsTime_time[ITEMSTIME_MAXITEMS];
-float ItemsTime_availableTime[ITEMSTIME_MAXITEMS];
-string GetItemsTimePicture(float i)
-{
-       switch(i)
-       {
-               case 0: return "item_large_armor";
-               case 1: return "item_mega_health";
-               case 2: return "strength";
-               case 3: return "shield";
-               case 4: return "item_mega_health";
-               case 5: return "strength";
-               case 6: return "shield";
-               case 7: return "fuelregen";
-               case 8: return "jetpack";
-               case 9: return "superweapons";
-               default: return "";
-       }
-}
-
-void DrawItemsTimeItem(vector myPos, vector mySize, float ar, float itemcode, float item_time, bool item_available, float item_availableTime)
-{
-       float t = 0;
-       vector color = '0 0 0';
-       float picalpha;
-
-       if(autocvar_hud_panel_itemstime_hidespawned == 2)
-               picalpha = 1;
-       else if(item_available)
-       {
-               float BLINK_FACTOR = 0.15;
-               float BLINK_BASE = 0.85;
-               float BLINK_FREQ = 5;
-               picalpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ);
-       }
-       else
-               picalpha = 0.5;
-       t = floor(item_time - time + 0.999);
-       if(t < 5)
-               color = '0.7 0 0';
-       else if(t < 10)
-               color = '0.7 0.7 0';
-       else
-               color = '1 1 1';
-
-       vector picpos, numpos;
-       if(autocvar_hud_panel_itemstime_iconalign)
-       {
-               numpos = myPos;
-               picpos = myPos + eX * (ar - 1) * mySize_y;
-       }
-       else
-       {
-               numpos = myPos + eX * mySize_y;
-               picpos = myPos;
-       }
-
-       if(t > 0 && autocvar_hud_panel_itemstime_progressbar)
-       {
-               vector p_pos, p_size;
-               if(autocvar_hud_panel_itemstime_progressbar_reduced)
-               {
-                       p_pos = numpos;
-                       p_size = eX * ((ar - 1)/ar) * mySize_x + eY * mySize_y;
-               }
-               else
-               {
-                       p_pos = myPos;
-                       p_size = mySize;
-               }
-               HUD_Panel_DrawProgressBar(p_pos, p_size, autocvar_hud_panel_itemstime_progressbar_name, t/autocvar_hud_panel_itemstime_progressbar_maxtime, 0, autocvar_hud_panel_itemstime_iconalign, color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-       }
-
-       if(t > 0 && autocvar_hud_panel_itemstime_text)
-               drawstring_aspect(numpos, ftos(t), eX * ((ar - 1)/ar) * mySize_x + eY * mySize_y, color, panel_fg_alpha, DRAWFLAG_NORMAL);
-       else
-               picpos.x = myPos.x + mySize.x / 2 - mySize.y / 2;
-       if(item_availableTime)
-               drawpic_aspect_skin_expanding(picpos, GetItemsTimePicture(itemcode), '1 1 0' * mySize_y, '1 1 1', panel_fg_alpha * picalpha, DRAWFLAG_NORMAL, item_availableTime);
-       drawpic_aspect_skin(picpos, GetItemsTimePicture(itemcode), '1 1 0' * mySize_y, '1 1 1', panel_fg_alpha * picalpha, DRAWFLAG_NORMAL);
-}
-
-void HUD_ItemsTime(void)
-{
-       if(!autocvar__hud_configure)
-       {
-               if(!(
-                       (autocvar_hud_panel_itemstime == 1 && spectatee_status != 0)
-               ||      (autocvar_hud_panel_itemstime == 2 && (spectatee_status != 0 || warmup_stage))
-                       )) { return; }
-
-               ItemsTime_time[0] = getstatf(STAT_ARMOR_LARGE_TIME);
-               ItemsTime_time[1] = getstatf(STAT_HEALTH_MEGA_TIME);
-               ItemsTime_time[2] = getstatf(STAT_INVISIBLE_TIME);
-               ItemsTime_time[3] = getstatf(STAT_SPEED_TIME);
-               ItemsTime_time[4] = getstatf(STAT_EXTRALIFE_TIME);
-               ItemsTime_time[5] = getstatf(STAT_STRENGTH_TIME);
-               ItemsTime_time[6] = getstatf(STAT_SHIELD_TIME);
-               ItemsTime_time[7] = getstatf(STAT_FUELREGEN_TIME);
-               ItemsTime_time[8] = getstatf(STAT_JETPACK_TIME);
-               ItemsTime_time[9] = getstatf(STAT_SUPERWEAPONS_TIME);
-       }
-       else
-       {
-               // do not show here mutator-dependent items
-               ItemsTime_time[0] = time + 0;
-               ItemsTime_time[1] = time + 8;
-               ItemsTime_time[2] = -1; // mutator-dependent
-               ItemsTime_time[3] = -1; // mutator-dependent
-               ItemsTime_time[4] = -1; // mutator-dependent
-               ItemsTime_time[5] = time + 0;
-               ItemsTime_time[6] = time + 4;
-               ItemsTime_time[7] = time + 49;
-               ItemsTime_time[8] = -1;
-               ItemsTime_time[9] = time + 28;
-       }
-
-       float i;
-       float count = 0;
-       if(autocvar_hud_panel_itemstime_hidespawned == 1)
-               for (i = 0; i < ITEMSTIME_MAXITEMS; ++i)
-                       count += (ItemsTime_time[i] > time || -ItemsTime_time[i] > time);
-       else if(autocvar_hud_panel_itemstime_hidespawned == 2)
-               for (i = 0; i < ITEMSTIME_MAXITEMS; ++i)
-                       count += (ItemsTime_time[i] > time);
-       else
-               for (i = 0; i < ITEMSTIME_MAXITEMS; ++i)
-                       count += (ItemsTime_time[i] != -1);
-       if (count == 0)
-               return;
-
-       HUD_Panel_UpdateCvars();
-
-       vector pos, mySize;
-       pos = panel_pos;
-       mySize = panel_size;
-
-       if(panel_bg_padding)
-       {
-               pos += '1 1 0' * panel_bg_padding;
-               mySize -= '2 2 0' * panel_bg_padding;
-       }
-
-       float rows, columns;
-       float ar = max(2, autocvar_hud_panel_itemstime_ratio) + 1;
-       rows = HUD_GetRowCount(count, mySize, ar);
-       columns = ceil(count/rows);
-
-       vector itemstime_size = eX * mySize.x*(1/columns) + eY * mySize.y*(1/rows);
-
-       vector offset = '0 0 0';
-       float newSize;
-       if(autocvar_hud_panel_itemstime_dynamicsize)
-       {
-               if(autocvar__hud_configure)
-               if(menu_enabled != 2)
-                       HUD_Panel_DrawBg(1); // also draw the bg of the entire panel
-
-               // reduce panel to avoid spacing items
-               if(itemstime_size.x / itemstime_size.y < ar)
-               {
-                       newSize = rows * itemstime_size.x / ar;
-                       pos.y += (mySize.y - newSize) / 2;
-                       mySize.y = newSize;
-                       itemstime_size.y = mySize.y / rows;
-               }
-               else
-               {
-                       newSize = columns * itemstime_size.y * ar;
-                       pos.x += (mySize.x - newSize) / 2;
-                       mySize.x = newSize;
-                       itemstime_size.x = mySize.x / columns;
-               }
-               panel_pos = pos - '1 1 0' * panel_bg_padding;
-               panel_size = mySize + '2 2 0' * panel_bg_padding;
-       }
-       else
-       {
-               if(itemstime_size.x/itemstime_size.y > ar)
-               {
-                       newSize = ar * itemstime_size.y;
-                       offset.x = itemstime_size.x - newSize;
-                       pos.x += offset.x/2;
-                       itemstime_size.x = newSize;
-               }
-               else
-               {
-                       newSize = 1/ar * itemstime_size.x;
-                       offset.y = itemstime_size.y - newSize;
-                       pos.y += offset.y/2;
-                       itemstime_size.y = newSize;
-               }
-       }
-
-       HUD_Panel_DrawBg(1);
-
-       float row = 0, column = 0;
-       bool item_available;
-       for (i = 0; i < ITEMSTIME_MAXITEMS; ++i) {
-               if (ItemsTime_time[i] == -1)
-                       continue;
-
-               float item_time = ItemsTime_time[i];
-               if(item_time < -1)
-               {
-                       item_available = true;
-                       item_time = -item_time;
-               }
-               else
-                       item_available = (item_time <= time);
-
-               if(ItemsTime_time[i] >= 0)
-               {
-                       if(time <= ItemsTime_time[i])
-                               ItemsTime_availableTime[i] = 0;
-                       else if(ItemsTime_availableTime[i] == 0)
-                               ItemsTime_availableTime[i] = time;
-               }
-               else if(ItemsTime_availableTime[i] == 0)
-                       ItemsTime_availableTime[i] = time;
 
-               float f = (time - ItemsTime_availableTime[i]) * 2;
-               f = (f > 1) ? 0 : bound(0, f, 1);
-
-               if(autocvar_hud_panel_itemstime_hidespawned == 1)
-                       if(!(ItemsTime_time[i] > time || -ItemsTime_time[i] > time))
-                               continue;
+// Minigame
+//
+#include "../common/minigames/cl_minigames_hud.qc"
 
-               if(autocvar_hud_panel_itemstime_hidespawned == 2)
-                       if(!(ItemsTime_time[i] > time))
-                               continue;
 
-               DrawItemsTimeItem(pos + eX * column * (itemstime_size.x + offset.x) + eY * row * (itemstime_size.y + offset.y), itemstime_size, ar, i, item_time, item_available, f);
-               ++row;
-               if(row >= rows)
-               {
-                       row = 0;
-                       column = column + 1;
-               }
-       }
-}
+// QuickMenu (#23)
+//
+#include "quickmenu.qc"
 
 
 /*
@@ -5065,6 +4830,20 @@ Main HUD system
 ==================
 */
 
+bool HUD_Panel_CheckFlags(int showflags)
+{
+       if ( HUD_Minigame_Showpanels() )
+               return showflags & PANEL_SHOW_MINIGAME;
+       return showflags & PANEL_SHOW_MAINGAME;
+}
+
+void HUD_Panel_Draw(entity panent)
+{
+       panel = panent;
+       if ( HUD_Panel_CheckFlags(panel.panel_showflags) )
+               panel.panel_draw();
+}
+
 void HUD_Reset (void)
 {
        // reset gametype specific icons
@@ -5090,12 +4869,17 @@ void HUD_Main (void)
        // they must fade only when the menu does
        if(scoreboard_fade_alpha == 1)
        {
-               (panel = HUD_PANEL(CENTERPRINT)).panel_draw();
+               HUD_Panel_Draw(HUD_PANEL(CENTERPRINT));
                return;
        }
 
        if(!autocvar__hud_configure && !hud_fade_alpha)
+       {
+               hud_fade_alpha = 1;
+               HUD_Panel_Draw(HUD_PANEL(VOTE));
+               hud_fade_alpha = 0;
                return;
+       }
 
        // Drawing stuff
        if (hud_skin_prev != autocvar_hud_skin)
@@ -5194,14 +4978,16 @@ void HUD_Main (void)
        hud_draw_maximized = 0;
        // draw panels in the order specified by panel_order array
        for(i = HUD_PANEL_NUM - 1; i >= 0; --i)
-               (panel = hud_panel[panel_order[i]]).panel_draw();
+               HUD_Panel_Draw(hud_panel[panel_order[i]]);
 
        hud_draw_maximized = 1; // panels that may be maximized must check this var
        // draw maximized panels on top
        if(hud_panel_radar_maximized)
-               (panel = HUD_PANEL(RADAR)).panel_draw();
+               HUD_Panel_Draw(HUD_PANEL(RADAR));
        if(autocvar__con_chat_maximized)
-               (panel = HUD_PANEL(CHAT)).panel_draw();
+               HUD_Panel_Draw(HUD_PANEL(CHAT));
+       if(hud_panel_quickmenu)
+               HUD_Panel_Draw(HUD_PANEL(QUICKMENU));
 
        HUD_Configure_PostDraw();