X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qh;h=ba9cb171e915a6c4ec81c830cabbc83615531b29;hp=5bc2ca4a736c1529b6b91a2bac7478a6291f5e51;hb=21307f327df5609b82d90496c1c6156d636d1c8d;hpb=d9b16a719396d1afe1a767dd35e8cc5de779a22d diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh index 5bc2ca4a7..ba9cb171e 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -1,17 +1,46 @@ -#ifndef HUD_H -#define HUD_H +#ifndef CLIENT_HUD_H +#define CLIENT_HUD_H #include "../common/weapons/all.qh" -const int HUD_PANEL_MAX = 24; -entity hud_panel[HUD_PANEL_MAX]; -const int HUD_PANEL_FIRST = 0; -int HUD_PANEL_NUM; -int HUD_PANEL_LAST; +bool HUD_Radar_Clickable(); +void HUD_Radar_Mouse(); -int panel_order[HUD_PANEL_MAX]; +REGISTRY(hud_panels, 24) +REGISTER_REGISTRY(Registerhud_panels) + +#define REGISTER_HUD_PANEL(id, draw_func, name, configflags, showflags) \ + void draw_func(); \ + REGISTER(Registerhud_panels, HUD_PANEL, hud_panels, id, m_id, new(hud_panel)) { \ + this.panel_id = this.m_id; \ + this.panel_draw = draw_func; \ + this.panel_name = #name; \ + this.panel_configflags = configflags; \ + this.panel_showflags = showflags; \ + } + +#define HUD_PANEL(NAME) HUD_PANEL_##NAME + +// draw the background/borders +#define HUD_Panel_DrawBg(theAlpha) do { \ + if(panel.current_panel_bg != "0" && panel.current_panel_bg != "") \ + draw_BorderPicture(panel_pos - '1 1 0' * panel_bg_border, panel.current_panel_bg, panel_size + '1 1 0' * 2 * panel_bg_border, panel_bg_color, panel_bg_alpha * theAlpha, '1 1 0' * (panel_bg_border/BORDER_MULTIPLIER));\ +} while(0) + +int panel_order[hud_panels_MAX]; string hud_panelorder_prev; +bool hud_draw_maximized; +bool hud_panel_radar_maximized; +bool hud_panel_radar_mouse; +float hud_panel_radar_bottom; +bool hud_panel_radar_temp_hidden; +bool chat_panel_modified; +bool radar_panel_modified; + +float HUD_Radar_InputEvent(float bInputType, float nPrimary, float nSecondary); +void HUD_Radar_Hide_Maximized(); + void HUD_Reset (void); void HUD_Main (void); @@ -25,10 +54,7 @@ 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_draw_maximized; -float hud_panel_radar_maximized; -float chat_panel_modified; -float radar_panel_modified; +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) @@ -39,7 +65,7 @@ float highlightedAction; // 0 = nothing, 1 = move, 2 = resize const float BORDER_MULTIPLIER = 0.25; float scoreboard_bottom; -int weapon_accuracy[WEP_MAXCOUNT]; +int weapon_accuracy[Weapons_MAX]; int complain_weapon; string complain_weapon_name; @@ -113,16 +139,32 @@ string panel_bg_padding_str; class(HUDPanel) .void() panel_draw; -float current_player; +// chat panel can be reduced / moved while the mapvote is active +// let know the mapvote panel about chat pos and size +float chat_posy; +float chat_sizey; -float GetPlayerColorForce(int i); +float current_player; 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; +const int PANEL_SHOW_NEVER = 0x00; +const int PANEL_SHOW_MAINGAME = 0x01; +const int PANEL_SHOW_MINIGAME = 0x02; +const int PANEL_SHOW_MAPVOTE = 0x04; +const int PANEL_SHOW_ALWAYS = 0xff; +bool HUD_Panel_CheckFlags(int showflags); + +.int panel_configflags; +const int PANEL_CONFIG_NO = 0x00; +const int PANEL_CONFIG_MAIN = 0x01; + // prev_* vars contain the health/armor at the previous FRAME // set to -1 when player is dead or was not playing @@ -136,47 +178,33 @@ float old_p_healthtime, old_p_armortime; // set to -1 to forcedly stop effects when we switch spectated player (e.g. from playerX: 70h to playerY: 50h) int prev_p_health, prev_p_armor; - -#define HUD_PANELS(HUD_PANEL) \ - HUD_PANEL(WEAPONS , HUD_Weapons , weapons) \ - HUD_PANEL(AMMO , HUD_Ammo , ammo) \ - HUD_PANEL(POWERUPS , HUD_Powerups , powerups) \ - HUD_PANEL(HEALTHARMOR , HUD_HealthArmor , healtharmor) \ - HUD_PANEL(NOTIFY , HUD_Notify , notify) \ - HUD_PANEL(TIMER , HUD_Timer , timer) \ - HUD_PANEL(RADAR , HUD_Radar , radar) \ - HUD_PANEL(SCORE , HUD_Score , score) \ - HUD_PANEL(RACETIMER , HUD_RaceTimer , racetimer) \ - HUD_PANEL(VOTE , HUD_Vote , vote) \ - HUD_PANEL(MODICONS , HUD_ModIcons , modicons) \ - HUD_PANEL(PRESSEDKEYS , HUD_PressedKeys , pressedkeys) \ - HUD_PANEL(CHAT , HUD_Chat , chat) \ - HUD_PANEL(ENGINEINFO , HUD_EngineInfo , engineinfo) \ - HUD_PANEL(INFOMESSAGES , HUD_InfoMessages , infomessages) \ - HUD_PANEL(PHYSICS , HUD_Physics , physics) \ - HUD_PANEL(CENTERPRINT , HUD_CenterPrint , centerprint) \ - HUD_PANEL(BUFFS , HUD_Buffs , buffs) - -#define HUD_PANEL(NAME, draw_func, name) \ - int HUD_PANEL_##NAME; \ - void draw_func(void); \ - void RegisterHUD_Panel_##NAME() { \ - HUD_PANEL_LAST = HUD_PANEL_##NAME = HUD_PANEL_NUM; \ - entity hud_panelent = spawn(); \ - hud_panel[HUD_PANEL_##NAME] = hud_panelent; \ - hud_panelent.classname = "hud_panel"; \ - hud_panelent.panel_name = #name; \ - hud_panelent.panel_id = HUD_PANEL_##NAME; \ - hud_panelent.panel_draw = draw_func; \ - HUD_PANEL_NUM++; \ - } \ - ACCUMULATE_FUNCTION(RegisterHUD_Panels, RegisterHUD_Panel_##NAME); - -HUD_PANELS(HUD_PANEL) -#undef HUD_PANEL - -#define HUD_PANEL(NAME) hud_panel[HUD_PANEL_##NAME] - +void HUD_ItemsTime(); + +REGISTER_HUD_PANEL(WEAPONS, HUD_Weapons, weapons, PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME) +REGISTER_HUD_PANEL(AMMO, HUD_Ammo, ammo, PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME) +REGISTER_HUD_PANEL(POWERUPS, HUD_Powerups, powerups, PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME) +REGISTER_HUD_PANEL(HEALTHARMOR, HUD_HealthArmor, healtharmor, PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME) +REGISTER_HUD_PANEL(NOTIFY, HUD_Notify, notify, PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS & ~PANEL_SHOW_MAPVOTE) +REGISTER_HUD_PANEL(TIMER, HUD_Timer, timer, PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS & ~PANEL_SHOW_MAPVOTE) +REGISTER_HUD_PANEL(RADAR, HUD_Radar, radar, PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME) +REGISTER_HUD_PANEL(SCORE, HUD_Score, score, PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS & ~PANEL_SHOW_MAPVOTE) +REGISTER_HUD_PANEL(RACETIMER, HUD_RaceTimer, racetimer, PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME) +REGISTER_HUD_PANEL(VOTE, HUD_Vote, vote, PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS ) +REGISTER_HUD_PANEL(MODICONS, HUD_ModIcons, modicons, PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME) +REGISTER_HUD_PANEL(PRESSEDKEYS, HUD_PressedKeys, pressedkeys, PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME) +REGISTER_HUD_PANEL(CHAT, HUD_Chat, chat, PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS ) +REGISTER_HUD_PANEL(ENGINEINFO, HUD_EngineInfo, engineinfo, PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS ) +REGISTER_HUD_PANEL(INFOMESSAGES, HUD_InfoMessages, infomessages, PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME) +REGISTER_HUD_PANEL(PHYSICS, HUD_Physics, physics, PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME) +REGISTER_HUD_PANEL(CENTERPRINT, HUD_CenterPrint, centerprint, PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME) +REGISTER_HUD_PANEL(MINIGAME_BOARD, HUD_MinigameBoard, minigameboard, PANEL_CONFIG_NO , PANEL_SHOW_MINIGAME) +REGISTER_HUD_PANEL(MINIGAME_STATUS, HUD_MinigameStatus, minigamestatus, PANEL_CONFIG_NO , PANEL_SHOW_MINIGAME) +REGISTER_HUD_PANEL(MINIGAME_HELP, HUD_MinigameHelp, minigamehelp, PANEL_CONFIG_NO , PANEL_SHOW_MINIGAME) +REGISTER_HUD_PANEL(MINIGAME_MENU, HUD_MinigameMenu, minigamemenu, PANEL_CONFIG_NO , PANEL_SHOW_ALWAYS ) +REGISTER_HUD_PANEL(MAPVOTE, MapVote_Draw, mapvote, PANEL_CONFIG_NO , PANEL_SHOW_MAPVOTE ) +REGISTER_HUD_PANEL(ITEMSTIME, HUD_ItemsTime, itemstime, PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME) +REGISTER_HUD_PANEL(QUICKMENU, HUD_QuickMenu, quickmenu, PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME) +// always add new panels to the end of list // Because calling lots of functions in QC apparently cuts fps in half on many machines: // ----------------------