X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qc;h=32af3f65c8c50218e30491ed3ce2839197b2d7c8;hb=2a7357beac768f93d7d80e320982c203c0412728;hp=87ba6060848cce13bab83b03556b60658913a4c0;hpb=fbf83f546eb4266e347f7cb51cdcf6f07444c851;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 87ba60608..32af3f65c 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -213,7 +213,10 @@ string MakeRaceString(float cp, float mytime, float histime, float lapdelta, str col = "^3"; } else + { col = "^7"; + timestr = ""; + } if(cp == 254) cpname = _("Start line"); @@ -460,25 +463,27 @@ void HUD_Weapons(void) WEPSET_COPY_AS(weapons_stat); float i, f, a, j, factor; float screen_ar, center_x, center_y; - float weapon_count, weapon_id, weapon_alpha; + float weapon_count, weapon_id; float row, column, rows, columns; float aspect = autocvar_hud_panel_weapons_aspect; - float show_accuracy, panel_weapon_accuracy; + float show_accuracy = false, panel_weapon_accuracy; float timeout = autocvar_hud_panel_weapons_timeout; - float timein_effect_length = (autocvar_hud_panel_weapons_timeout_effect ? 0.375 : 0); - float timeout_effect_length = (autocvar_hud_panel_weapons_timeout_effect ? 0.75 : 0); + float timein_effect_length = autocvar_hud_panel_weapons_timeout_speed_in; //? 0.375 : 0); + float timeout_effect_length = autocvar_hud_panel_weapons_timeout_speed_out; //? 0.75 : 0); - float ammo_type, ammo_full, ammo_alpha; - float barsize_x, barsize_y, baroffset_x, baroffset_y; + float ammo_type, ammo_full; + float barsize_x = 0, barsize_y = 0, baroffset_x = 0, baroffset_y = 0; + vector ammo_color = '1 0 1'; + float ammo_alpha = 1; float when = autocvar_hud_panel_weapons_complainbubble_time; float fadetime = autocvar_hud_panel_weapons_complainbubble_fadetime; vector weapon_pos, weapon_size; local noref vector old_panel_size; // fteqcc sucks - vector color, ammo_color; + vector color; // check to see if we want to continue if(hud != HUD_NORMAL) { return; } @@ -487,7 +492,7 @@ void HUD_Weapons(void) { if((!autocvar_hud_panel_weapons) || (spectatee_status == -1)) return; - else if(timeout && time >= weapontime + timeout + timeout_effect_length) + else if(timeout && time >= weapontime + timeout + timeout_effect_length && ((autocvar_hud_panel_weapons_timeout_effect != 1) && !(autocvar_hud_panel_weapons_timeout_fadebgmin + autocvar_hud_panel_weapons_timeout_fadefgmin))) { weaponprevtime = time; return; @@ -502,15 +507,6 @@ void HUD_Weapons(void) draw_beginBoldFont(); - // calculate fading effect to weapon images for when the panel is idle - if(autocvar_hud_panel_weapons_fade) - { - weapon_alpha = 3.2 - 2 * (time - weapontime); - weapon_alpha = bound(0.7, weapon_alpha, 1) * panel_fg_alpha; - } - else - weapon_alpha = panel_fg_alpha; - // figure out weapon order (how the weapons are sorted) // TODO make this configurable if(weaponorder_bypriority != autocvar_cl_weaponpriority || !weaponorder[0]) { @@ -555,6 +551,7 @@ void HUD_Weapons(void) } // do we own this weapon? + weapon_count = 0; for(i = 0; i <= WEP_LAST-WEP_FIRST; ++i) if(WEPSET_CONTAINS_AW(weapons_stat, weaponorder[i].weapon)) ++weapon_count; @@ -590,12 +587,21 @@ void HUD_Weapons(void) { if (timeout && time >= weapontime + timeout) // apply timeout effect if needed { - f = (time - (weapontime + timeout)) / timeout_effect_length; - if (autocvar_hud_panel_weapons_timeout_effect == 1 || autocvar_hud_panel_weapons_timeout_effect == 3) + f = bound(0, (time - (weapontime + timeout)) / timeout_effect_length, 1); + + // fade the panel alpha + if(autocvar_hud_panel_weapons_timeout_effect == 1) + { + panel_bg_alpha *= (autocvar_hud_panel_weapons_timeout_fadebgmin * f + (1 - f)); + panel_fg_alpha *= (autocvar_hud_panel_weapons_timeout_fadefgmin * f + (1 - f)); + } + else if(autocvar_hud_panel_weapons_timeout_effect == 3) { panel_bg_alpha *= (1 - f); panel_fg_alpha *= (1 - f); } + + // move the panel off the screen if (autocvar_hud_panel_weapons_timeout_effect == 2 || autocvar_hud_panel_weapons_timeout_effect == 3) { f *= f; // for a cooler movement @@ -621,12 +627,21 @@ void HUD_Weapons(void) } else if (timeout && time < weaponprevtime + timein_effect_length) // apply timein effect if needed { - f = (time - weaponprevtime) / timein_effect_length; - if (autocvar_hud_panel_weapons_timeout_effect == 1 || autocvar_hud_panel_weapons_timeout_effect == 3) + f = bound(0, (time - weaponprevtime) / timein_effect_length, 1); + + // fade the panel alpha + if(autocvar_hud_panel_weapons_timeout_effect == 1) + { + panel_bg_alpha *= (autocvar_hud_panel_weapons_timeout_fadebgmin * (1 - f) + f); + panel_fg_alpha *= (autocvar_hud_panel_weapons_timeout_fadefgmin * (1 - f) + f); + } + else if(autocvar_hud_panel_weapons_timeout_effect == 3) { panel_bg_alpha *= (f); panel_fg_alpha *= (f); } + + // move the panel back on screen if (autocvar_hud_panel_weapons_timeout_effect == 2 || autocvar_hud_panel_weapons_timeout_effect == 3) { f *= f; // for a cooler movement @@ -694,6 +709,7 @@ void HUD_Weapons(void) acc_col[i] = stov(cvar_string(strcat("accuracy_color", ftos(i)))); } + row = column = 0; for(i = 0; i <= WEP_LAST-WEP_FIRST; ++i) { // retrieve information about the current weapon to be drawn @@ -718,7 +734,7 @@ void HUD_Weapons(void) // draw background behind currently selected weapon if(self.weapon == switchweapon) - drawpic_aspect_skin(weapon_pos, "weapon_current_bg", weapon_size, '1 1 1', weapon_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(weapon_pos, "weapon_current_bg", weapon_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); // draw the weapon accuracy if(show_accuracy) @@ -744,7 +760,7 @@ void HUD_Weapons(void) if(WEPSET_CONTAINS_AW(weapons_stat, self.weapon)) { // draw the weapon image - drawpic_aspect_skin(weapon_pos, strcat("weapon", self.netname), weapon_size, '1 1 1', weapon_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(weapon_pos, strcat("weapon", self.netname), weapon_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); // draw weapon label string switch(autocvar_hud_panel_weapons_label) @@ -950,7 +966,7 @@ void HUD_Ammo(void) mySize -= '2 2 0' * panel_bg_padding; } - float rows, columns, row, column; + float rows = 0, columns, row, column; vector ammo_size; if (autocvar_hud_panel_ammo_onlycurrent) ammo_size = mySize; @@ -965,7 +981,7 @@ void HUD_Ammo(void) ammo_size = eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows); } - local noref vector offset; // fteqcc sucks + local vector offset = '0 0 0'; // fteqcc sucks float newSize; if(ammo_size_x/ammo_size_y > 3) { @@ -1010,6 +1026,7 @@ void HUD_Ammo(void) stat_items = getstati(STAT_ITEMS, 0, 24); if (stat_items & IT_UNLIMITED_WEAPON_AMMO) infinite_ammo = TRUE; + row = column = 0; for (i = 0; i < AMMO_COUNT; ++i) { currently_selected = stat_items & GetAmmoItemCode(i); DrawAmmoItem(pos + eX * column * (ammo_size_x + offset_x) + eY * row * (ammo_size_y + offset_y), ammo_size, i, currently_selected, infinite_ammo); @@ -1027,7 +1044,7 @@ void HUD_Ammo(void) void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, float vertical, float icon_right_align, vector color, float theAlpha, float fadelerp) { - vector newPos, newSize; + vector newPos = '0 0 0', newSize = '0 0 0'; vector picpos, numpos; if (vertical) @@ -1159,7 +1176,7 @@ void HUD_Powerups(void) float panel_ar = mySize_x/mySize_y; float is_vertical = (panel_ar < 1); - vector shield_offset, strength_offset, superweapons_offset; + vector shield_offset = '0 0 0', strength_offset = '0 0 0', superweapons_offset = '0 0 0'; float superweapons_is = -1; @@ -1252,7 +1269,7 @@ void HUD_Powerups(void) superweapons_iconalign = strength_iconalign; superweapons_baralign = strength_baralign; } - else if(superweapons_is == 2) + else // if(superweapons_is == 2) { superweapons_offset = shield_offset; superweapons_iconalign = shield_iconalign; @@ -1449,7 +1466,7 @@ void HUD_HealthArmor(void) { float panel_ar = mySize_x/mySize_y; float is_vertical = (panel_ar < 1); - vector health_offset, armor_offset; + vector health_offset = '0 0 0', armor_offset = '0 0 0'; if (panel_ar >= 4 || (panel_ar >= 1/4 && panel_ar < 1)) { mySize_x *= 0.5; @@ -2048,93 +2065,6 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s }*/ } -void HUD_KillCenterprint(string s1, string s2, float type, float msg) -{ - float gentle; - gentle = (autocvar_cl_gentle || autocvar_cl_gentle_messages); - if(msg == MSG_SUICIDE) { - if (type == DEATH_TEAMCHANGE) { - centerprint_hud(sprintf(_("You are now on: %s"), s1)); - } else if (type == DEATH_AUTOTEAMCHANGE) { - centerprint_hud(sprintf(_("You have been moved into a different team to improve team balance\nYou are now on: %s"), s1)); - } else if (type == DEATH_CAMP) { - if(gentle) - centerprint_hud(_("^1Reconsider your tactics, camper!")); - else - centerprint_hud(_("^1Die camper!")); - } else if (type == DEATH_NOAMMO) { - if(gentle) - centerprint_hud(_("^1You are reinserted into the game for running out of ammo...")); - else - centerprint_hud(_("^1You were killed for running out of ammo...")); - } else if (type == DEATH_ROT) { - if(gentle) - centerprint_hud(_("^1You need to preserve your health")); - else - centerprint_hud(_("^1You grew too old without taking your medicine")); - } else if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) { - if(gentle) - centerprint_hud(_("^1Don't go against team mates!")); - else - centerprint_hud(_("^1Don't shoot your team mates!")); - } else if (type == DEATH_QUIET) { - // do nothing - } else { // generic message - if(gentle) - centerprint_hud(_("^1You need to be more careful!")); - else - centerprint_hud(_("^1You killed your own dumb self!")); - } - } else if(msg == MSG_KILL) { - if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) { - if(gentle) { - centerprint_hud(sprintf(_("^1Moron! You went against ^7%s^1, a team mate!"), s1)); - } else { - centerprint_hud(sprintf(_("^1Moron! You fragged ^7%s^1, a team mate!"), s1)); - } - } else if (type == KILL_FIRST_BLOOD) { - if(gentle) { - centerprint_hud(_("^1First score")); - } else { - centerprint_hud(_("^1First blood")); - } - } else if (type == KILL_FIRST_VICTIM) { - if(gentle) { - centerprint_hud(_("^1First casualty")); - } else { - centerprint_hud(_("^1First victim")); - } - } else if (type == KILL_TYPEFRAG) { // s2 contains "advanced kill messages" such as ping, handicap... - if(gentle) { - centerprint_hud(strcat(sprintf(_("^1You scored against ^7%s^1 who was typing!"), s1), s2)); - } else { - centerprint_hud(strcat(sprintf(_("^1You typefragged ^7%s"), s1), s2)); - } - } else if (type == KILL_TYPEFRAGGED) { - if(gentle) { - centerprint_hud(strcat(sprintf(_("^1You were scored against by ^7%s^1 while you were typing!"), s1), s2)); - } else { - centerprint_hud(strcat(sprintf(_("^1You were typefragged by ^7%s"), s1), s2)); - } - } else if (type == KILL_FRAG) { - if(gentle) { - centerprint_hud(strcat(sprintf(_("^4You scored against ^7%s"), s1), s2)); - } else { - centerprint_hud(strcat(sprintf(_("^4You fragged ^7%s"), s1), s2)); - } - } else { // generic message - if(gentle) { - centerprint_hud(strcat(sprintf(_("^1You were scored against by ^7%s"), s1), s2)); - } else { - centerprint_hud(strcat(sprintf(_("^1You were fragged by ^7%s"), s1), s2)); - } - } - } else if(msg == MSG_KILL_ACTION) { - // TODO: invent more centerprints here? - centerprint_hud(_("^1Watch your step!")); - } -} - void HUD_Notify(void) { if(!autocvar__hud_configure) @@ -2175,7 +2105,7 @@ void HUD_Notify(void) float width_attacker; string attacker, victim, icon; - float i, j, w, type, step, limit; + float i, j, step, limit; if(autocvar_hud_panel_notify_flip) //order items from the top down { i = 0; @@ -2489,7 +2419,7 @@ void HUD_UpdatePlayerTeams(); void HUD_Score_Rankings(vector pos, vector mySize, entity me, float team_count) { float score; - entity tm, pl; + entity tm = world, pl; #define SCOREPANEL_MAX_ENTRIES 6 #define SCOREPANEL_ASPECTRATIO 2 float entries = bound(1, floor(SCOREPANEL_MAX_ENTRIES * mySize_y/mySize_x * SCOREPANEL_ASPECTRATIO), SCOREPANEL_MAX_ENTRIES); @@ -2502,13 +2432,11 @@ void HUD_Score_Rankings(vector pos, vector mySize, entity me, float team_count) float name_size = mySize_x*0.75; float spacing_size = mySize_x*0.04; const float highlight_alpha = 0.2; - float i, me_printed, first_pl; + float i = 0, me_printed = 0, first_pl = 0; string s; - i = 0; - first_pl = 0; if (autocvar__hud_configure) { - float players_per_team; + float players_per_team = 0; if (team_count) { // show team scores in the first line @@ -2532,7 +2460,7 @@ void HUD_Score_Rankings(vector pos, vector mySize, entity me, float team_count) { rgb = '1 1 0'; drawfill(pos, eX * mySize_x + eY * fontsize_y, rgb, highlight_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); - s = GetPlayerName(pl.sv_entnum); + s = GetPlayerName(player_localnum); score = 7; } else @@ -2632,7 +2560,7 @@ void HUD_Score(void) mySize -= '2 2 0' * panel_bg_padding; } - float score, distribution; + float score, distribution = 0; string sign; vector distribution_color; entity tm, pl, me; @@ -2722,8 +2650,8 @@ void HUD_Score(void) drawstring_aspect(pos + eX * 0.75 * mySize_x, distribution_str, eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL); draw_endBoldFont(); } else { // teamgames - float scores_count, row, column, rows, columns; - local noref vector offset; // fteqcc sucks + float scores_count = 0, row, column, rows = 0, columns = 0; + local noref vector offset = '0 0 0'; vector score_pos, score_size; //for scores other than myteam if (spectatee_status == -1 || autocvar_hud_panel_score_rankings) { @@ -2764,6 +2692,7 @@ void HUD_Score(void) float max_fragcount; max_fragcount = -99; draw_beginBoldFont(); + row = column = 0; for(tm = teams.sort_next; tm; tm = tm.sort_next) { if(tm.team == FL_SPECTATOR) continue; @@ -2832,7 +2761,7 @@ void HUD_RaceTimer (void) } // always force 4:1 aspect - vector newSize; + vector newSize = '0 0 0'; if(mySize_x/mySize_y > 4) { newSize_x = 4 * mySize_y; @@ -2924,13 +2853,13 @@ void HUD_RaceTimer (void) if(race_mycheckpointtime) { a = bound(0, 2 - (time - race_mycheckpointtime), 1); - s = MakeRaceString(race_mycheckpoint, TIME_DECODE(race_mycheckpointdelta), -!race_mycheckpointenemy, race_mycheckpointlapsdelta, race_mycheckpointenemy); + s = MakeRaceString(race_mycheckpoint, TIME_DECODE(race_mycheckpointdelta), -(race_mycheckpointenemy == ""), race_mycheckpointlapsdelta, race_mycheckpointenemy); drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); } if(race_othercheckpointtime && race_othercheckpointenemy != "") { a = bound(0, 2 - (time - race_othercheckpointtime), 1); - s = MakeRaceString(race_othercheckpoint, -TIME_DECODE(race_othercheckpointdelta), -!race_othercheckpointenemy, race_othercheckpointlapsdelta, race_othercheckpointenemy); + s = MakeRaceString(race_othercheckpoint, -TIME_DECODE(race_othercheckpointdelta), -(race_othercheckpointenemy == ""), race_othercheckpointlapsdelta, race_othercheckpointenemy); drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); } @@ -3043,7 +2972,7 @@ void HUD_VoteWindow(void) } // always force 3:1 aspect - vector newSize; + vector newSize = '0 0 0'; if(mySize_x/mySize_y > 3) { newSize_x = 3 * mySize_y; @@ -3303,7 +3232,7 @@ void HUD_Mod_KH(vector pos, vector mySize) float kh_keys; float keyteam; float a, aa; - vector p, pa, kh_size, kh_asize; + vector p = '0 0 0', pa, kh_size = '0 0 0', kh_asize = '0 0 0'; kh_keys = getstati(STAT_KH_KEYS); @@ -3620,6 +3549,8 @@ void HUD_Mod_Race(vector pos, vector mySize) float rank; if(race_status > 0) rank = race_CheckName(race_status_name); + else + rank = 0; string rankname; rankname = race_PlaceName(rank); @@ -3664,6 +3595,11 @@ void DrawDomItem(vector myPos, vector mySize, float aspect_ratio, float layout, float stat, pps_ratio; string pic; vector color; +#ifdef GMQCC + stat = -1; + pic = ""; + color = '0 0 0'; +#endif switch(i) { case 0: @@ -3681,10 +3617,12 @@ void DrawDomItem(vector myPos, vector mySize, float aspect_ratio, float layout, pic = "dom_icon_yellow"; color = '1 1 0'; break; + default: case 3: stat = getstatf(STAT_DOM_PPS_PINK); pic = "dom_icon_pink"; color = '1 0 1'; + break; } pps_ratio = stat / getstatf(STAT_DOM_TOTAL_PPS); @@ -3725,7 +3663,7 @@ void HUD_Mod_Dom(vector myPos, vector mySize) { mod_active = 1; // required in each mod function that always shows something entity tm; - float teams_count; + float teams_count = 0; for(tm = teams.sort_next; tm; tm = tm.sort_next) if(tm.team != FL_SPECTATOR) ++teams_count; @@ -3738,7 +3676,7 @@ void HUD_Mod_Dom(vector myPos, vector mySize) columns = ceil(teams_count/rows); int i; - float row, column; + float row = 0, column = 0; for(i=0; i aspect) { newSize_x = aspect * mySize_y; @@ -4057,7 +3995,7 @@ void HUD_InfoMessages(void) } // always force 5:1 aspect - vector newSize; + vector newSize = '0 0 0'; if(mySize_x/mySize_y > 5) { newSize_x = 5 * mySize_y; @@ -4180,7 +4118,7 @@ void HUD_InfoMessages(void) if(teamplay && !intermission && !spectatee_status && gametype != MAPINFO_TYPE_CA && teamnagger) { - float ts_min, ts_max; + float ts_min = 0, ts_max = 0; tm = teams.sort_next; if (tm) { @@ -4246,7 +4184,7 @@ void HUD_Physics(void) panel_size -= '2 2 0' * panel_bg_padding; } - float acceleration_progressbar_scale; + float acceleration_progressbar_scale = 0; if(autocvar_hud_panel_physics_progressbar && autocvar_hud_panel_physics_acceleration_progressbar_scale > 1) acceleration_progressbar_scale = autocvar_hud_panel_physics_acceleration_progressbar_scale; @@ -4319,7 +4257,7 @@ void HUD_Physics(void) //compute layout float panel_ar = panel_size_x/panel_size_y; - vector speed_offset, acceleration_offset; + vector speed_offset = '0 0 0', acceleration_offset = '0 0 0'; if (panel_ar >= 5 && !acceleration_progressbar_scale) { panel_size_x *= 0.5; @@ -4361,7 +4299,7 @@ void HUD_Physics(void) HUD_Panel_GetProgressBarColor(speed); HUD_Panel_DrawProgressBar(panel_pos + speed_offset, panel_size, "progressbar", speed/max_speed, 0, speed_baralign, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } - vector tmp_offset, tmp_size; + vector tmp_offset = '0 0 0', tmp_size = '0 0 0'; if (autocvar_hud_panel_physics_text == 1 || autocvar_hud_panel_physics_text == 2) { tmp_size_x = panel_size_x * 0.75; @@ -4420,12 +4358,12 @@ void HUD_Physics(void) if(autocvar_hud_panel_physics_progressbar == 1 || autocvar_hud_panel_physics_progressbar == 2) { float peak_offset_x; - vector peak_size; + vector peak_size = '0 0 0'; if (speed_baralign == 0) peak_offset_x = min(top_speed, max_speed)/max_speed * panel_size_x; else if (speed_baralign == 1) peak_offset_x = (1 - min(top_speed, max_speed)/max_speed) * panel_size_x; - else if (speed_baralign == 2) + else // if (speed_baralign == 2) peak_offset_x = min(top_speed, max_speed)/max_speed * panel_size_x * 0.5; //if speed is not 0 the speed progressbar already fetched the color if (speed == 0) @@ -4671,7 +4609,7 @@ void HUD_CenterPrint (void) entries = bound(1, floor(panel_size_y/height), CENTERPRINT_MAX_ENTRIES); float i, j, k, n; - float a, sz, align, current_msg_pos_y, msg_size; + float a, sz, align, current_msg_pos_y = 0, msg_size; vector pos; string ts; @@ -4703,6 +4641,8 @@ void HUD_CenterPrint (void) a = bound(0, (time - (centerprint_expire_time[j] - centerprint_time[j])) / max(0.0001, autocvar_hud_panel_centerprint_fade_in), 1); else if (centerprint_expire_time[j] > time) a = (centerprint_expire_time[j] - time) / max(0.0001, autocvar_hud_panel_centerprint_fade_out); + else + a = 0; // set the size from fading in/out before subsequent fading sz = autocvar_hud_panel_centerprint_fade_minfontsize + a * (1 - autocvar_hud_panel_centerprint_fade_minfontsize); @@ -4957,8 +4897,8 @@ void HUD_Main (void) if(autocvar__hud_panelorder != hud_panelorder_prev) { for(i = 0; i < HUD_PANEL_NUM; ++i) panel_order[i] = -1; - string s; - float p_num, warning; + string s = ""; + float p_num, warning = false; float argc = tokenize_console(autocvar__hud_panelorder); if (argc > HUD_PANEL_NUM) warning = true; @@ -5019,8 +4959,13 @@ void HUD_Main (void) HUD_Panel_HlBorder(panel_bg_border + 1.5 * hlBorderSize, '0 0.5 1', 0.25 * (1 - autocvar__menu_alpha)); } if (!hud_configure_prev) + { + if(autocvar_hud_cursormode) { setcursormode(1); } hudShiftState = 0; + } } + else if (hud_configure_prev && autocvar_hud_cursormode) + setcursormode(0); hud_configure_prev = autocvar__hud_configure;