X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fhud_config.qc;h=78ed8442adecd81d685aaba6d2a183f6c47464bf;hb=3d7b56eab12bb00420baad9edb80b06b8ad53072;hp=a6c22c74eee9bf113f4d71570b90ec57f7a33938;hpb=55f166a94432b80e71f6f76702a1b15fde60c474;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud/hud_config.qc b/qcsrc/client/hud/hud_config.qc index a6c22c74e..78ed8442a 100644 --- a/qcsrc/client/hud/hud_config.qc +++ b/qcsrc/client/hud/hud_config.qc @@ -1,15 +1,11 @@ #include "hud_config.qh" -#include "hud.qh" -#include "panel/scoreboard.qh" -#include -#include -#include +#include +#include +#include +#include #include -#define HUD_Write(s) fputs(fh, s) -#define HUD_Write_Cvar(cvar) HUD_Write(strcat("seta ", cvar, " \"", cvar_string(cvar), "\"\n")) -#define HUD_Write_PanelCvar(cvar_suf) str = strcat("hud_panel_", panel.panel_name, cvar_suf), HUD_Write_Cvar(str) // Save the config void HUD_Panel_ExportCfg(string cfgname) { @@ -45,6 +41,7 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_Cvar("hud_progressbar_health_color"); HUD_Write_Cvar("hud_progressbar_armor_color"); HUD_Write_Cvar("hud_progressbar_fuel_color"); + HUD_Write_Cvar("hud_progressbar_oxygen_color"); HUD_Write_Cvar("hud_progressbar_nexball_color"); HUD_Write_Cvar("hud_progressbar_speed_color"); HUD_Write_Cvar("hud_progressbar_acceleration_color"); @@ -62,9 +59,9 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write("\n"); // common cvars for all panels - for (int i = 0; i < hud_panels_COUNT; ++i) + for (int i = 0; i < REGISTRY_COUNT(hud_panels); ++i) { - panel = hud_panels_from(i); + panel = REGISTRY_GET(hud_panels, i); HUD_Write_PanelCvar("_pos"); HUD_Write_PanelCvar("_size"); @@ -74,170 +71,9 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_PanelCvar("_bg_alpha"); HUD_Write_PanelCvar("_bg_border"); HUD_Write_PanelCvar("_bg_padding"); - switch(panel) { - case HUD_PANEL_WEAPONS: - HUD_Write_Cvar("hud_panel_weapons_accuracy"); - HUD_Write_Cvar("hud_panel_weapons_label"); - HUD_Write_Cvar("hud_panel_weapons_label_scale"); - HUD_Write_Cvar("hud_panel_weapons_complainbubble"); - HUD_Write_Cvar("hud_panel_weapons_complainbubble_padding"); - HUD_Write_Cvar("hud_panel_weapons_complainbubble_time"); - HUD_Write_Cvar("hud_panel_weapons_complainbubble_fadetime"); - HUD_Write_Cvar("hud_panel_weapons_complainbubble_color_outofammo"); - HUD_Write_Cvar("hud_panel_weapons_complainbubble_color_donthave"); - HUD_Write_Cvar("hud_panel_weapons_complainbubble_color_unavailable"); - HUD_Write_Cvar("hud_panel_weapons_ammo"); - HUD_Write_Cvar("hud_panel_weapons_ammo_color"); - HUD_Write_Cvar("hud_panel_weapons_ammo_alpha"); - HUD_Write_Cvar("hud_panel_weapons_aspect"); - HUD_Write_Cvar("hud_panel_weapons_timeout"); - HUD_Write_Cvar("hud_panel_weapons_timeout_effect"); - HUD_Write_Cvar("hud_panel_weapons_timeout_fadebgmin"); - HUD_Write_Cvar("hud_panel_weapons_timeout_fadefgmin"); - HUD_Write_Cvar("hud_panel_weapons_timeout_speed_in"); - HUD_Write_Cvar("hud_panel_weapons_timeout_speed_out"); - HUD_Write_Cvar("hud_panel_weapons_onlyowned"); - HUD_Write_Cvar("hud_panel_weapons_orderbyimpulse"); - HUD_Write_Cvar("hud_panel_weapons_noncurrent_alpha"); - HUD_Write_Cvar("hud_panel_weapons_noncurrent_scale"); - HUD_Write_Cvar("hud_panel_weapons_selection_radius"); - HUD_Write_Cvar("hud_panel_weapons_selection_speed"); - break; - case HUD_PANEL_AMMO: - HUD_Write_Cvar("hud_panel_ammo_onlycurrent"); - HUD_Write_Cvar("hud_panel_ammo_noncurrent_alpha"); - HUD_Write_Cvar("hud_panel_ammo_noncurrent_scale"); - HUD_Write_Cvar("hud_panel_ammo_iconalign"); - HUD_Write_Cvar("hud_panel_ammo_progressbar"); - HUD_Write_Cvar("hud_panel_ammo_progressbar_name"); - HUD_Write_Cvar("hud_panel_ammo_progressbar_xoffset"); - HUD_Write_Cvar("hud_panel_ammo_text"); - break; - case HUD_PANEL_POWERUPS: - HUD_Write_Cvar("hud_panel_powerups_iconalign"); - HUD_Write_Cvar("hud_panel_powerups_baralign"); - HUD_Write_Cvar("hud_panel_powerups_progressbar"); - HUD_Write_Cvar("hud_panel_powerups_text"); - break; - case HUD_PANEL_HEALTHARMOR: - HUD_Write_Cvar("hud_panel_healtharmor_combined"); - HUD_Write_Cvar("hud_panel_healtharmor_flip"); - HUD_Write_Cvar("hud_panel_healtharmor_iconalign"); - HUD_Write_Cvar("hud_panel_healtharmor_baralign"); - HUD_Write_Cvar("hud_panel_healtharmor_progressbar"); - HUD_Write_Cvar("hud_panel_healtharmor_progressbar_health"); - HUD_Write_Cvar("hud_panel_healtharmor_progressbar_armor"); - HUD_Write_Cvar("hud_panel_healtharmor_progressbar_gfx"); - HUD_Write_Cvar("hud_panel_healtharmor_progressbar_gfx_smooth"); - HUD_Write_Cvar("hud_panel_healtharmor_text"); - break; - case HUD_PANEL_NOTIFY: - HUD_Write_Cvar("hud_panel_notify_flip"); - HUD_Write_Cvar("hud_panel_notify_fontsize"); - HUD_Write_Cvar("hud_panel_notify_time"); - HUD_Write_Cvar("hud_panel_notify_fadetime"); - HUD_Write_Cvar("hud_panel_notify_icon_aspect"); - break; - case HUD_PANEL_TIMER: - break; - case HUD_PANEL_RADAR: - HUD_Write_Cvar("hud_panel_radar_foreground_alpha"); - HUD_Write_Cvar("hud_panel_radar_rotation"); - HUD_Write_Cvar("hud_panel_radar_zoommode"); - HUD_Write_Cvar("hud_panel_radar_scale"); - HUD_Write_Cvar("hud_panel_radar_maximized_scale"); - HUD_Write_Cvar("hud_panel_radar_maximized_size"); - HUD_Write_Cvar("hud_panel_radar_maximized_rotation"); - HUD_Write_Cvar("hud_panel_radar_maximized_zoommode"); - break; - case HUD_PANEL_SCORE: - HUD_Write_Cvar("hud_panel_score_rankings"); - break; - case HUD_PANEL_VOTE: - HUD_Write_Cvar("hud_panel_vote_alreadyvoted_alpha"); - break; - case HUD_PANEL_MODICONS: - HUD_Write_Cvar("hud_panel_modicons_ca_layout"); - HUD_Write_Cvar("hud_panel_modicons_dom_layout"); - HUD_Write_Cvar("hud_panel_modicons_freezetag_layout"); - break; - case HUD_PANEL_PRESSEDKEYS: - HUD_Write_Cvar("hud_panel_pressedkeys_aspect"); - HUD_Write_Cvar("hud_panel_pressedkeys_attack"); - break; - case HUD_PANEL_ENGINEINFO: - HUD_Write_Cvar("hud_panel_engineinfo_framecounter_time"); - HUD_Write_Cvar("hud_panel_engineinfo_framecounter_decimals"); - break; - case HUD_PANEL_INFOMESSAGES: - HUD_Write_Cvar("hud_panel_infomessages_flip"); - break; - case HUD_PANEL_PHYSICS: - HUD_Write_Cvar("hud_panel_physics_speed_unit_show"); - HUD_Write_Cvar("hud_panel_physics_speed_max"); - HUD_Write_Cvar("hud_panel_physics_speed_vertical"); - HUD_Write_Cvar("hud_panel_physics_topspeed"); - HUD_Write_Cvar("hud_panel_physics_topspeed_time"); - HUD_Write_Cvar("hud_panel_physics_acceleration_max"); - HUD_Write_Cvar("hud_panel_physics_acceleration_vertical"); - HUD_Write_Cvar("hud_panel_physics_flip"); - HUD_Write_Cvar("hud_panel_physics_baralign"); - HUD_Write_Cvar("hud_panel_physics_progressbar"); - HUD_Write_Cvar("hud_panel_physics_acceleration_progressbar_mode"); - HUD_Write_Cvar("hud_panel_physics_acceleration_progressbar_scale"); - HUD_Write_Cvar("hud_panel_physics_acceleration_progressbar_nonlinear"); - HUD_Write_Cvar("hud_panel_physics_text"); - HUD_Write_Cvar("hud_panel_physics_text_scale"); - break; - case HUD_PANEL_CENTERPRINT: - HUD_Write_Cvar("hud_panel_centerprint_align"); - HUD_Write_Cvar("hud_panel_centerprint_flip"); - HUD_Write_Cvar("hud_panel_centerprint_fontscale"); - HUD_Write_Cvar("hud_panel_centerprint_time"); - HUD_Write_Cvar("hud_panel_centerprint_fade_in"); - HUD_Write_Cvar("hud_panel_centerprint_fade_out"); - HUD_Write_Cvar("hud_panel_centerprint_fade_subsequent"); - HUD_Write_Cvar("hud_panel_centerprint_fade_subsequent_passone"); - HUD_Write_Cvar("hud_panel_centerprint_fade_subsequent_passone_minalpha"); - HUD_Write_Cvar("hud_panel_centerprint_fade_subsequent_passtwo"); - HUD_Write_Cvar("hud_panel_centerprint_fade_subsequent_passtwo_minalpha"); - HUD_Write_Cvar("hud_panel_centerprint_fade_subsequent_minfontsize"); - HUD_Write_Cvar("hud_panel_centerprint_fade_minfontsize"); - break; - case HUD_PANEL_ITEMSTIME: - HUD_Write_Cvar("hud_panel_itemstime_iconalign"); - HUD_Write_Cvar("hud_panel_itemstime_progressbar"); - HUD_Write_Cvar("hud_panel_itemstime_progressbar_name"); - HUD_Write_Cvar("hud_panel_itemstime_progressbar_reduced"); - HUD_Write_Cvar("hud_panel_itemstime_text"); - HUD_Write_Cvar("hud_panel_itemstime_ratio"); - HUD_Write_Cvar("hud_panel_itemstime_dynamicsize"); - break; - case HUD_PANEL_MAPVOTE: - HUD_Write_Cvar("hud_panel_mapvote_highlight_border"); - break; - case HUD_PANEL_QUICKMENU: - HUD_Write_Cvar("hud_panel_quickmenu_align"); - break; - case HUD_PANEL_SCOREBOARD: - HUD_Write_Cvar("hud_panel_scoreboard_fadeinspeed"); - HUD_Write_Cvar("hud_panel_scoreboard_fadeoutspeed"); - HUD_Write_Cvar("hud_panel_scoreboard_respawntime_decimals"); - HUD_Write_Cvar("hud_panel_scoreboard_table_bg_alpha"); - HUD_Write_Cvar("hud_panel_scoreboard_table_bg_scale"); - HUD_Write_Cvar("hud_panel_scoreboard_table_fg_alpha"); - HUD_Write_Cvar("hud_panel_scoreboard_table_fg_alpha_self"); - HUD_Write_Cvar("hud_panel_scoreboard_table_highlight"); - HUD_Write_Cvar("hud_panel_scoreboard_table_highlight_alpha"); - HUD_Write_Cvar("hud_panel_scoreboard_table_highlight_alpha_self"); - HUD_Write_Cvar("hud_panel_scoreboard_bg_teams_color_team"); - HUD_Write_Cvar("hud_panel_scoreboard_accuracy_doublerows"); - HUD_Write_Cvar("hud_panel_scoreboard_accuracy_nocolors"); - break; - } + panel.panel_export(fh); HUD_Write("\n"); } - MUTATOR_CALLHOOK(HUD_WriteCvars, fh); HUD_Write("menu_sync\n"); // force the menu to reread the cvars, so that the dialogs are updated @@ -265,8 +101,8 @@ vector HUD_Panel_CheckMove(vector myPos, vector mySize) vector myCenter, targCenter; vector myTarget = myPos; int i; - for (i = 0; i < hud_panels_COUNT; ++i) { - panel = hud_panels_from(i); + for (i = 0; i < REGISTRY_COUNT(hud_panels); ++i) { + panel = REGISTRY_GET(hud_panels, i); if(!(panel.panel_configflags & PANEL_CONFIG_MAIN)) continue; if(panel == highlightedPanel) continue; HUD_Panel_UpdatePosSize(); @@ -362,8 +198,8 @@ vector HUD_Panel_CheckResize(vector mySize, vector resizeorigin) { vector dist; float ratio = mySize.x/mySize.y; int i; - for (i = 0; i < hud_panels_COUNT; ++i) { - panel = hud_panels_from(i); + for (i = 0; i < REGISTRY_COUNT(hud_panels); ++i) { + panel = REGISTRY_GET(hud_panels, i); if(!(panel.panel_configflags & PANEL_CONFIG_MAIN)) continue; if(panel == highlightedPanel) continue; HUD_Panel_UpdatePosSize(); @@ -663,22 +499,19 @@ void HUD_Panel_Arrow_Action(float nPrimary) } } -entity tab_panels[hud_panels_MAX]; +entity tab_panels[REGISTRY_MAX(hud_panels)]; entity tab_panel; vector tab_panel_pos; float tab_backward; void reset_tab_panels() { - for (int i = 0; i < hud_panels_COUNT; ++i) + for (int i = 0; i < REGISTRY_COUNT(hud_panels); ++i) tab_panels[i] = NULL; } float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary) { string s; - if(bInputType == 2) - return false; - if(!autocvar__hud_configure) return false; @@ -689,6 +522,12 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary) return true; } + if(bInputType == 2) + return false; + + // at this point bInputType can only be 0 or 1 (key pressed or released) + bool key_pressed = (bInputType == 0); + // block any input while a menu dialog is fading // don't block mousepos read as it leads to cursor jumps in the interaction with the menu if(autocvar__menu_alpha) @@ -698,32 +537,26 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary) return true; } - // allow console bind to work - string con_keys = findkeysforcommand("toggleconsole", 0); - int keys = tokenize(con_keys); // findkeysforcommand returns data for this - - bool hit_con_bind = false; - int i; - for (i = 0; i < keys; ++i) - { - if(nPrimary == stof(argv(i))) - hit_con_bind = true; - } - - if(bInputType == 0) { + int hudShiftState_prev = hudShiftState; + int mouseClicked_prev = mouseClicked; + if(key_pressed) { if(nPrimary == K_ALT) hudShiftState |= S_ALT; if(nPrimary == K_CTRL) hudShiftState |= S_CTRL; if(nPrimary == K_SHIFT) hudShiftState |= S_SHIFT; + if(nPrimary == K_MOUSE1) mouseClicked |= S_MOUSE1; + if(nPrimary == K_MOUSE2) mouseClicked |= S_MOUSE2; } - else if(bInputType == 1) { + else { if(nPrimary == K_ALT) hudShiftState -= (hudShiftState & S_ALT); if(nPrimary == K_CTRL) hudShiftState -= (hudShiftState & S_CTRL); if(nPrimary == K_SHIFT) hudShiftState -= (hudShiftState & S_SHIFT); + if(nPrimary == K_MOUSE1) mouseClicked -= (mouseClicked & S_MOUSE1); + if(nPrimary == K_MOUSE2) mouseClicked -= (mouseClicked & S_MOUSE2); } if(nPrimary == K_CTRL) { - if (bInputType == 1) //ctrl has been released + if (!key_pressed) //ctrl has been released { if (tab_panel) { @@ -737,37 +570,23 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary) } } - if(nPrimary == K_MOUSE1) - { - if(bInputType == 0) // key pressed - mouseClicked |= S_MOUSE1; - else if(bInputType == 1) // key released - mouseClicked -= (mouseClicked & S_MOUSE1); - } - else if(nPrimary == K_MOUSE2) + if(nPrimary == K_ESCAPE) { - if(bInputType == 0) // key pressed - mouseClicked |= S_MOUSE2; - else if(bInputType == 1) // key released - mouseClicked -= (mouseClicked & S_MOUSE2); - } - else if(nPrimary == K_ESCAPE) - { - if (bInputType == 1) + if (!key_pressed) return true; hud_configure_menu_open = 1; localcmd("menu_showhudexit\n"); } else if(nPrimary == K_BACKSPACE && hudShiftState & S_CTRL) { - if (bInputType == 1) + if (!key_pressed) return true; if (!hud_configure_menu_open) HUD_Configure_Exit_Force(); } else if(nPrimary == K_TAB && hudShiftState & S_CTRL) // switch panel { - if (bInputType == 1 || mouseClicked) + if (!key_pressed || mouseClicked) return true; // FIXME minor bug: if a panel is highlighted, has the same pos_x and @@ -800,7 +619,7 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary) vector candidate_pos = '0 0 0'; const float LEVELS_NUM = 4; float level_height = vid_conheight / LEVELS_NUM; -LABEL(find_tab_panel) + LABEL(find_tab_panel) level = floor(tab_panel_pos.y / level_height) * level_height; //starting level candidate_pos.x = (!tab_backward) ? vid_conwidth : 0; start_posX = tab_panel_pos.x; @@ -808,9 +627,9 @@ LABEL(find_tab_panel) k=0; while(++k) { - for(i = 0; i < hud_panels_COUNT; ++i) + for(int i = 0; i < REGISTRY_COUNT(hud_panels); ++i) { - panel = hud_panels_from(i); + panel = REGISTRY_GET(hud_panels, i); if(!(panel.panel_configflags & PANEL_CONFIG_MAIN)) continue; if (panel == tab_panels[i] || panel == starting_panel) @@ -856,7 +675,7 @@ LABEL(find_tab_panel) } else if(nPrimary == K_SPACE && hudShiftState & S_CTRL) // enable/disable highlighted panel or dock { - if (bInputType == 1 || mouseClicked) + if (!key_pressed || mouseClicked) return true; if (highlightedPanel) @@ -869,7 +688,7 @@ LABEL(find_tab_panel) } else if(nPrimary == 'c' && hudShiftState & S_CTRL) // copy highlighted panel size { - if (bInputType == 1 || mouseClicked) + if (!key_pressed || mouseClicked) return true; if (highlightedPanel) @@ -881,7 +700,7 @@ LABEL(find_tab_panel) } else if(nPrimary == 'v' && hudShiftState & S_CTRL) // past copied size on the highlighted panel { - if (bInputType == 1 || mouseClicked) + if (!key_pressed || mouseClicked) return true; if (panel_size_copied == '0 0 0' || !highlightedPanel) @@ -910,7 +729,7 @@ LABEL(find_tab_panel) } else if(nPrimary == 'z' && hudShiftState & S_CTRL) // undo last action { - if (bInputType == 1 || mouseClicked) + if (!key_pressed || mouseClicked) return true; //restore previous values if (highlightedPanel_backup) @@ -924,13 +743,13 @@ LABEL(find_tab_panel) } else if(nPrimary == 's' && hudShiftState & S_CTRL) // save config { - if (bInputType == 1 || mouseClicked) + if (!key_pressed || mouseClicked) return true; localcmd("hud save myconfig\n"); } else if(nPrimary == K_UPARROW || nPrimary == K_DOWNARROW || nPrimary == K_LEFTARROW || nPrimary == K_RIGHTARROW) { - if (bInputType == 1) + if (!key_pressed) { pressed_key_time = 0; return true; @@ -948,8 +767,19 @@ LABEL(find_tab_panel) if (highlightedPanel) HUD_Panel_EnableMenu(); } - else if(hit_con_bind || nPrimary == K_PAUSE) + else if(nPrimary == K_PAUSE) return false; + else if (hudShiftState_prev == hudShiftState && mouseClicked_prev == mouseClicked) + { + // allow console bind to work + string con_keys = findkeysforcommand("toggleconsole", 0); + int keys = tokenize(con_keys); // findkeysforcommand returns data for this + for (int i = 0; i < keys; ++i) + { + if(nPrimary == stof(argv(i))) + return false; // hit console bind + } + } return true; } @@ -957,12 +787,12 @@ LABEL(find_tab_panel) int HUD_Panel_Check_Mouse_Pos(bool allow_move) { int i, j = 0; - while(j < hud_panels_COUNT) + while(j < REGISTRY_COUNT(hud_panels)) { i = panel_order[j]; j += 1; - panel = hud_panels_from(i); + panel = REGISTRY_GET(hud_panels, i); if(!(panel.panel_configflags & PANEL_CONFIG_MAIN)) continue; HUD_Panel_UpdatePosSize(); @@ -1003,7 +833,7 @@ void HUD_Panel_FirstInDrawQ(float id) int i; int place = -1; // find out where in the array our current id is, save into place - for(i = 0; i < hud_panels_COUNT; ++i) + for(i = 0; i < REGISTRY_COUNT(hud_panels); ++i) { if(panel_order[i] == id) { @@ -1013,7 +843,7 @@ void HUD_Panel_FirstInDrawQ(float id) } // place last if we didn't find a place for it yet (probably new panel, or screwed up cvar) if(place == -1) - place = hud_panels_COUNT - 1; + place = REGISTRY_COUNT(hud_panels) - 1; // move all ids up by one step in the array until "place" for(i = place; i > 0; --i) @@ -1025,7 +855,7 @@ void HUD_Panel_FirstInDrawQ(float id) // let's save them into the cvar by some strcat trickery string s = ""; - for(i = 0; i < hud_panels_COUNT; ++i) + for(i = 0; i < REGISTRY_COUNT(hud_panels); ++i) { s = strcat(s, ftos(panel_order[i]), " "); } @@ -1037,12 +867,12 @@ void HUD_Panel_Highlight(float allow_move) { int i, j = 0; - while(j < hud_panels_COUNT) + while(j < REGISTRY_COUNT(hud_panels)) { i = panel_order[j]; j += 1; - panel = hud_panels_from(i); + panel = REGISTRY_GET(hud_panels, i); if(!(panel.panel_configflags & PANEL_CONFIG_MAIN)) continue; HUD_Panel_UpdatePosSize(); @@ -1052,7 +882,7 @@ void HUD_Panel_Highlight(float allow_move) // move if(allow_move && mousepos.x > panel_pos.x && mousepos.y > panel_pos.y && mousepos.x < panel_pos.x + panel_size.x && mousepos.y < panel_pos.y + panel_size.y) { - highlightedPanel = hud_panels_from(i); + highlightedPanel = REGISTRY_GET(hud_panels, i); HUD_Panel_FirstInDrawQ(i); highlightedAction = 1; panel_click_distance = mousepos - panel_pos; @@ -1061,7 +891,7 @@ void HUD_Panel_Highlight(float allow_move) // resize from topleft border else if(mousepos.x >= panel_pos.x - border && mousepos.y >= panel_pos.y - border && mousepos.x <= panel_pos.x + 0.5 * panel_size.x && mousepos.y <= panel_pos.y + 0.5 * panel_size.y) { - highlightedPanel = hud_panels_from(i); + highlightedPanel = REGISTRY_GET(hud_panels, i); HUD_Panel_FirstInDrawQ(i); highlightedAction = 2; resizeCorner = 1; @@ -1072,7 +902,7 @@ void HUD_Panel_Highlight(float allow_move) // resize from topright border else if(mousepos.x >= panel_pos.x + 0.5 * panel_size.x && mousepos.y >= panel_pos.y - border && mousepos.x <= panel_pos.x + panel_size.x + border && mousepos.y <= panel_pos.y + 0.5 * panel_size.y) { - highlightedPanel = hud_panels_from(i); + highlightedPanel = REGISTRY_GET(hud_panels, i); HUD_Panel_FirstInDrawQ(i); highlightedAction = 2; resizeCorner = 2; @@ -1084,7 +914,7 @@ void HUD_Panel_Highlight(float allow_move) // resize from bottomleft border else if(mousepos.x >= panel_pos.x - border && mousepos.y >= panel_pos.y + 0.5 * panel_size.y && mousepos.x <= panel_pos.x + 0.5 * panel_size.x && mousepos.y <= panel_pos.y + panel_size.y + border) { - highlightedPanel = hud_panels_from(i); + highlightedPanel = REGISTRY_GET(hud_panels, i); HUD_Panel_FirstInDrawQ(i); highlightedAction = 2; resizeCorner = 3; @@ -1096,7 +926,7 @@ void HUD_Panel_Highlight(float allow_move) // resize from bottomright border else if(mousepos.x >= panel_pos.x + 0.5 * panel_size.x && mousepos.y >= panel_pos.y + 0.5 * panel_size.y && mousepos.x <= panel_pos.x + panel_size.x + border && mousepos.y <= panel_pos.y + panel_size.y + border) { - highlightedPanel = hud_panels_from(i); + highlightedPanel = REGISTRY_GET(hud_panels, i); HUD_Panel_FirstInDrawQ(i); highlightedAction = 2; resizeCorner = 4; @@ -1245,8 +1075,8 @@ void HUD_Configure_Frame() if(!hud_configure_prev) { hudShiftState = 0; - for(i = hud_panels_COUNT - 1; i >= 0; --i) - hud_panels_from(panel_order[i]).update_time = time; + for(i = REGISTRY_COUNT(hud_panels) - 1; i >= 0; --i) + REGISTRY_GET(hud_panels, panel_order[i]).update_time = time; } // NOTE this check is necessary because _menu_alpha isn't updated the frame the menu gets enabled