#include "hud.qh"
#include "panel/scoreboard.qh"
#include <client/autocvars.qh>
-#include <client/defs.qh>
#include <client/miscfunctions.qh>
+#include <client/view.qh>
-#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)
{
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");
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");
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_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
hud_configure_menu_open = 0;
localcmd("togglemenu\n");
}
+ cursor_type = CURSOR_NORMAL;
cvar_set("_hud_configure", "0");
}
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();
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();
}
}
-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)
if (bInputType == 1)
return true;
if (!hud_configure_menu_open)
- cvar_set("_hud_configure", "0");
+ HUD_Configure_Exit_Force();
}
else if(nPrimary == K_TAB && hudShiftState & S_CTRL) // switch panel
{
k=0;
while(++k)
{
- for(i = 0; i < hud_panels_COUNT; ++i)
+ for(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)
return true;
}
-float HUD_Panel_Check_Mouse_Pos(float allow_move)
+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();
// 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)
{
- return 1;
+ return CURSOR_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)
{
- return 2;
+ return CURSOR_RESIZE;
}
// 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)
{
- return 3;
+ return CURSOR_RESIZE2;
}
// 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)
{
- return 3;
+ return CURSOR_RESIZE2;
}
// 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)
{
- return 2;
+ return CURSOR_RESIZE;
}
}
- return 0;
+ return CURSOR_NORMAL;
}
// move a panel to the beginning of the panel order array (which means it gets drawn last, on top of everything else)
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)
{
}
// 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)
// 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]), " ");
}
{
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();
// 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;
// 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;
// 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;
// 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;
// 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;
hud_configure_menu_open = 2;
localcmd("menu_showhudoptions ", highlightedPanel.panel_name, "\n");
}
-float mouse_over_panel;
void HUD_Panel_Mouse()
{
if(autocvar__menu_alpha == 1)
return;
- if (!autocvar_hud_cursormode)
- update_mousepos();
-
if(mouseClicked)
{
if(prevMouseClicked == 0)
prevMouseClickedTime = time;
prevMouseClickedPos = mousepos;
}
- mouse_over_panel = HUD_Panel_Check_Mouse_Pos(mouseClicked & S_MOUSE1);
+ cursor_type = HUD_Panel_Check_Mouse_Pos(mouseClicked & S_MOUSE1);
}
}
else
if(prevMouseClicked)
highlightedAction = 0;
if(hud_configure_menu_open == 2)
- mouse_over_panel = 0;
+ cursor_type = CURSOR_NORMAL;
else
- mouse_over_panel = HUD_Panel_Check_Mouse_Pos(true);
- if (mouse_over_panel && !tab_panel)
+ cursor_type = HUD_Panel_Check_Mouse_Pos(true);
+ if (cursor_type != CURSOR_NORMAL && !tab_panel) // mouse over a panel?
drawfill(panel_pos - '1 1 0' * panel_bg_border, panel_size + '2 2 0' * panel_bg_border, '1 1 1', .1, DRAWFLAG_NORMAL);
}
- // draw cursor after performing move/resize to have the panel pos/size updated before mouse_over_panel
- float cursor_alpha = 1 - autocvar__menu_alpha;
-
- if(!mouse_over_panel)
- draw_cursor_normal(mousepos, '1 1 1', cursor_alpha);
- else if(mouse_over_panel == 1)
- draw_cursor(mousepos, '0.5 0.5 0', "/cursor_move", '1 1 1', cursor_alpha);
- else if(mouse_over_panel == 2)
- draw_cursor(mousepos, '0.5 0.5 0', "/cursor_resize", '1 1 1', cursor_alpha);
- else
- draw_cursor(mousepos, '0.5 0.5 0', "/cursor_resize2", '1 1 1', cursor_alpha);
-
- prevMouseClicked = mouseClicked;
}
void HUD_Configure_DrawGrid()
{
if(!hud_configure_prev)
{
- if(autocvar_hud_cursormode)
- setcursormode(1);
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
{
if(hud_configure_menu_open)
hud_configure_menu_open = 0;
- if(autocvar_hud_cursormode)
- setcursormode(0);
hud_dynamic_shake_factor = -1;
}
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff