X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud_config.qc;h=e2f82d6b6b4f49172df1f2c1cb5e853c1e8524fa;hb=99e4fa0264127dfcf4675d5f645061b51af815e4;hp=15b924dd9cb9f6eae222bad1524642f001f52003;hpb=c106e8c1b35da50e0de9323b4b67a5e1d81c8fc7;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc index 15b924dd9..e2f82d6b6 100644 --- a/qcsrc/client/hud_config.qc +++ b/qcsrc/client/hud_config.qc @@ -80,6 +80,10 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_PanelCvar_q("_aspect"); HUD_Write_PanelCvar_q("_timeout"); HUD_Write_PanelCvar_q("_timeout_effect"); + HUD_Write_PanelCvar_q("_timeout_fadebgmin"); + HUD_Write_PanelCvar_q("_timeout_fadefgmin"); + HUD_Write_PanelCvar_q("_timeout_speed_in"); + HUD_Write_PanelCvar_q("_timeout_speed_out"); HUD_Write_PanelCvar_q("_onlyowned"); break; case HUD_PANEL_AMMO: @@ -113,7 +117,6 @@ void HUD_Panel_ExportCfg(string cfgname) case HUD_PANEL_NOTIFY: HUD_Write_PanelCvar_q("_flip"); HUD_Write_PanelCvar_q("_fontsize"); - HUD_Write_PanelCvar_q("_print"); HUD_Write_PanelCvar_q("_time"); HUD_Write_PanelCvar_q("_fadetime"); break; @@ -127,6 +130,8 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_PanelCvar_q("_scale"); HUD_Write_PanelCvar_q("_maximized_scale"); HUD_Write_PanelCvar_q("_maximized_size"); + HUD_Write_PanelCvar_q("_maximized_rotation"); + HUD_Write_PanelCvar_q("_maximized_zoommode"); break; case HUD_PANEL_SCORE: HUD_Write_PanelCvar_q("_rankings"); @@ -139,6 +144,7 @@ void HUD_Panel_ExportCfg(string cfgname) break; case HUD_PANEL_PRESSEDKEYS: HUD_Write_PanelCvar_q("_aspect"); + HUD_Write_PanelCvar_q("_attack"); break; case HUD_PANEL_ENGINEINFO: HUD_Write_PanelCvar_q("_framecounter_time"); @@ -159,8 +165,11 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_PanelCvar_q("_flip"); HUD_Write_PanelCvar_q("_baralign"); HUD_Write_PanelCvar_q("_progressbar"); - HUD_Write_PanelCvar_q("_acceleration_mode"); + HUD_Write_PanelCvar_q("_progressbar_acceleration_mode"); + HUD_Write_PanelCvar_q("_progressbar_acceleration_scale"); + HUD_Write_PanelCvar_q("_progressbar_acceleration_nonlinear"); HUD_Write_PanelCvar_q("_text"); + HUD_Write_PanelCvar_q("_text_scale"); break; case HUD_PANEL_CENTERPRINT: HUD_Write_PanelCvar_q("_align"); @@ -177,6 +186,16 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_PanelCvar_q("_fade_subsequent_minfontsize"); HUD_Write_PanelCvar_q("_fade_minfontsize"); break; + case HUD_PANEL_ITEMSTIME: + HUD_Write_PanelCvar_q("_iconalign"); + HUD_Write_PanelCvar_q("_progressbar"); + HUD_Write_PanelCvar_q("_progressbar_name"); + HUD_Write_PanelCvar_q("_progressbar_reduced"); + HUD_Write_PanelCvar_q("_showspawned"); + HUD_Write_PanelCvar_q("_text"); + HUD_Write_PanelCvar_q("_ratio"); + HUD_Write_PanelCvar_q("_size_dinamic"); + break; } HUD_Write("\n"); } @@ -631,8 +650,7 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary) { string s; - // we only care for keyboard events - if(bInputType != 0 && bInputType != 1) + if(bInputType == 2) return false; if(!autocvar__hud_configure) @@ -642,13 +660,20 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary) if(autocvar__menu_alpha) return true; + if(bInputType == 3) + { + mousepos_x = nPrimary; + mousepos_y = nSecondary; + return true; + } + // allow console bind to work string con_keys; float keys; con_keys = findkeysforcommand("toggleconsole", 0); keys = tokenize(con_keys); // findkeysforcommand returns data for this - float hit_con_bind, i; + float hit_con_bind = 0, i; for (i = 0; i < keys; ++i) { if(nPrimary == stof(argv(i))) @@ -740,8 +765,8 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary) } tab_backward = (hudShiftState & S_SHIFT); - float k, level, start_pos_x; - vector candidate_pos; + float k, level = 0, start_pos_x; + vector candidate_pos = '0 0 0'; const float LEVELS_NUM = 4; float level_height = vid_conheight / LEVELS_NUM; :find_tab_panel @@ -892,7 +917,7 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary) float HUD_Panel_Check_Mouse_Pos(float allow_move) { - float i, j, border; + float i, j = 0, border; while(j < HUD_PANEL_NUM) { @@ -904,7 +929,7 @@ float HUD_Panel_Check_Mouse_Pos(float allow_move) border = max(8, panel_bg_border); // FORCED border so a small border size doesn't mean you can't resize // 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) + 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; } @@ -959,7 +984,7 @@ void HUD_Panel_FirstInDrawQ(float id) panel_order[0] = id; // let's save them into the cvar by some strcat trickery - string s; + string s = ""; for(i = 0; i < HUD_PANEL_NUM; ++i) { s = strcat(s, ftos(panel_order[i]), " "); @@ -972,7 +997,7 @@ void HUD_Panel_FirstInDrawQ(float id) void HUD_Panel_Highlight(float allow_move) { - float i, j, border; + float i, j = 0, border; while(j < HUD_PANEL_NUM) { @@ -984,7 +1009,7 @@ void HUD_Panel_Highlight(float allow_move) border = max(8, panel_bg_border); // FORCED border so a small border size doesn't mean you can't resize // 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) + 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 = i; HUD_Panel_FirstInDrawQ(i); @@ -1066,10 +1091,13 @@ void HUD_Panel_Mouse() if(autocvar__menu_alpha == 1) return; - mousepos = mousepos + getmousepos() * autocvar_menu_mouse_speed; - - mousepos_x = bound(0, mousepos_x, vid_conwidth); - mousepos_y = bound(0, mousepos_y, vid_conheight); + if not(autocvar_hud_cursormode) + { + mousepos = mousepos + getmousepos() * autocvar_menu_mouse_speed; + + mousepos_x = bound(0, mousepos_x, vid_conwidth); + mousepos_y = bound(0, mousepos_y, vid_conheight); + } if(mouseClicked) { @@ -1129,7 +1157,7 @@ void HUD_Panel_Mouse() HUD_Panel_SetPos(mousepos - panel_click_distance); else if(highlightedAction == 2) { - vector mySize; + vector mySize = '0 0 0'; if(resizeCorner == 1) { mySize_x = panel_click_resizeorigin_x - (mousepos_x - panel_click_distance_x); mySize_y = panel_click_resizeorigin_y - (mousepos_y - panel_click_distance_y);