X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qh;h=d30eea145de3c29e86281185819f3732f4344bb0;hb=5c99ce6fe3050cddf897e9988ff59dd0a7c1ba0a;hp=9850b78d20b91696d465b69f4a92fe72f3c2d22b;hpb=1df4fb3cec6f442b521cd1f956d47c72776ada88;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh index 9850b78d2..d30eea145 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -35,6 +35,8 @@ int vote_prev; // previous state of vote_active to check for a change float vote_alpha; float vote_change; // "time" when vote_active changed +float hud_panel_quickmenu; + vector mousepos; vector panel_click_distance; // mouse cursor distance from the top left corner of the panel (saved only upon a click) vector panel_click_resizeorigin; // coordinates for opposite point when resizing @@ -125,12 +127,11 @@ float chat_sizey; float current_player; -float GetPlayerColorForce(int i); - float stringwidth_colors(string s, vector theSize); +float stringwidth_nocolors(string s, vector theSize); +float GetPlayerColorForce(int i); int GetPlayerColor(int i); string GetPlayerName(int i); -float stringwidth_nocolors(string s, vector theSize); void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, float length_ratio, bool vertical, float baralign, vector theColor, float theAlpha, int drawflag); .int panel_showflags; @@ -178,7 +179,10 @@ void HUD_ItemsTime(); HUD_PANEL(MINIGAME_HELP, HUD_MinigameHelp ,minigamehelp, PANEL_SHOW_MINIGAME ) \ HUD_PANEL(MINIGAME_MENU, HUD_MinigameMenu ,minigamemenu, PANEL_SHOW_ALWAYS ) \ HUD_PANEL(MAPVOTE , MapVote_Draw ,mapvote, PANEL_SHOW_ALWAYS ) \ - HUD_PANEL(ITEMSTIME , HUD_ItemsTime ,itemstime, PANEL_SHOW_MAINGAME ) + HUD_PANEL(ITEMSTIME , HUD_ItemsTime ,itemstime, PANEL_SHOW_MAINGAME ) \ + HUD_PANEL(QUICKMENU , HUD_QuickMenu , quickmenu, PANEL_SHOW_MAINGAME ) \ + // always add new panels to the end of list + #define HUD_PANEL(NAME, draw_func, name, showflags) \ int HUD_PANEL_##NAME; \