X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qc;h=b0a814b792f354c6f6c84663f9e2405fbe7027d6;hb=cefa33bbac7f657fa6565161e9694a92e4141a67;hp=dcba37e4036c4c03cf0c020db55d13bd6d4998ca;hpb=808af18b9de3aa78d498026a6b2855fe58c2e8eb;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index dcba37e40..b0a814b79 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -1501,8 +1501,11 @@ void HUD_Weapons(void) float f, screen_ar; float center_x, center_y; - if(!autocvar_hud_panel_weapons && !autocvar__hud_configure) - return; + if(!autocvar__hud_configure) + { + if(!autocvar_hud_panel_weapons) return; + if(spectatee_status == -1) return; + } float timeout = cvar("hud_panel_weapons_timeout"); float timeout_effect_length, timein_effect_length; @@ -1663,8 +1666,8 @@ void HUD_Weapons(void) float fullammo_shells, fullammo_nails, fullammo_rockets, fullammo_cells, fullammo_fuel; vector ammo_color; float ammo_alpha; - float barsize_x, barsize_y; wpnsize = eX * panel_size_x*(1/columns) + eY * panel_size_y*(1/rows); + float barsize_x, barsize_y, baroffset_x, baroffset_y; float show_ammo = cvar("hud_panel_weapons_ammo"); if (show_ammo) { @@ -1676,15 +1679,18 @@ void HUD_Weapons(void) ammo_color = stov(cvar_string("hud_panel_weapons_ammo_color")); ammo_alpha = panel_fg_alpha * cvar("hud_panel_weapons_ammo_alpha"); + if(wpnsize_x/wpnsize_y > aspect) { barsize_x = aspect * wpnsize_y; barsize_y = wpnsize_y; + baroffset_x = (wpnsize_x - barsize_x) / 2; } else { barsize_y = 1/aspect * wpnsize_x; barsize_x = wpnsize_x; + baroffset_y = (wpnsize_y - barsize_y) / 2; } } @@ -1703,8 +1709,10 @@ void HUD_Weapons(void) weapon_fired[weapon_number-WEP_FIRST] = floor(weapon_stats / 64); if (acc_col_x[0] == -1) for (i = 0; i < acc_levels; ++i) - acc_col[i] = stov(cvar_string(strcat("hud_panel_weapons_accuracy_color", ftos(i)))); + acc_col[i] = stov(cvar_string(strcat("accuracy_color", ftos(i)))); } + + float weapons_st = getstati(STAT_WEAPONS); float label = cvar("hud_panel_weapons_label"); for(i = 0; i < weapon_cnt; ++i) @@ -1745,7 +1753,7 @@ void HUD_Weapons(void) } // draw the weapon icon - if((self.impulse >= 0) && (getstati(STAT_WEAPONS) & self.weapons)) + if((weapid >= 0) && (weapons_st & self.weapons)) { drawpic_aspect_skin(wpnpos, strcat("weapon", self.netname), wpnsize, '1 1 1', wpnalpha, DRAWFLAG_NORMAL); @@ -1773,21 +1781,9 @@ void HUD_Weapons(void) default: fullammo = 60; } - float barpos_x, barpos_y; - if(wpnsize_x/wpnsize_y > aspect) - { - barpos_x = wpnpos_x + (wpnsize_x - barsize_x) / 2; - barpos_y = wpnpos_y; - } - else - { - barpos_y = wpnpos_y + (wpnsize_y - barsize_y) / 2; - barpos_x = wpnpos_x; - } - drawsetcliparea( - barpos_x, - barpos_y, + wpnpos_x + baroffset_x, + wpnpos_y + baroffset_y, barsize_x * bound(0, a/fullammo, 1), barsize_y); drawpic_aspect_skin(wpnpos, "weapon_ammo", wpnsize, ammo_color, ammo_alpha, DRAWFLAG_NORMAL); @@ -1927,8 +1923,11 @@ void DrawAmmoItem(vector myPos, vector mySize, float itemcode, float currently_s void HUD_Ammo(void) { - if(!autocvar_hud_panel_ammo && !autocvar__hud_configure) - return; + if(!autocvar__hud_configure) + { + if(!autocvar_hud_panel_ammo) return; + if(spectatee_status == -1) return; + } active_panel = HUD_PANEL_AMMO; HUD_Panel_UpdateCvars(ammo); @@ -2076,16 +2075,12 @@ void DrawNumIcon_expanding(float iconalign, vector myPos, vector mySize, float x // Powerups (#2) // void HUD_Powerups(void) { - if(!autocvar_hud_panel_powerups && !autocvar__hud_configure) - return; - if(!autocvar__hud_configure) { - if not(getstati(STAT_ITEMS) & (IT_STRENGTH | IT_INVINCIBLE)) - return; - - if (getstati(STAT_HEALTH) <= 0) - return; + if(!autocvar_hud_panel_powerups) return; + if(spectatee_status == -1) return; + if not(getstati(STAT_ITEMS) & (IT_STRENGTH | IT_INVINCIBLE)) return; + if (getstati(STAT_HEALTH) <= 0) return; } active_panel = HUD_PANEL_POWERUPS; @@ -2300,8 +2295,11 @@ void HUD_Powerups(void) { // void HUD_HealthArmor(void) { - if(!autocvar_hud_panel_healtharmor && !autocvar__hud_configure) - return; + if(!autocvar__hud_configure) + { + if(!autocvar_hud_panel_healtharmor) return; + if(spectatee_status == -1) return; + } active_panel = HUD_PANEL_HEALTHARMOR; HUD_Panel_UpdateCvars(healtharmor); @@ -2617,34 +2615,27 @@ string Weapon_KillMessage(float deathtype) return w_deathtypestring; } -float killnotify_times[10]; -float killnotify_deathtype[10]; -float killnotify_actiontype[10]; // 0 = "Y [used by] X", 1 = "X [did action to] Y" -string killnotify_attackers[10]; -string killnotify_victims[10]; +#define KN_MAX_ENTRIES 10 +float kn_index; +float killnotify_times[KN_MAX_ENTRIES]; +float killnotify_deathtype[KN_MAX_ENTRIES]; +float killnotify_actiontype[KN_MAX_ENTRIES]; // 0 = "Y [used by] X", 1 = "X [did action to] Y" +string killnotify_attackers[KN_MAX_ENTRIES]; +string killnotify_victims[KN_MAX_ENTRIES]; void HUD_KillNotify_Push(string attacker, string victim, float actiontype, float wpn) { - float i; - for (i = 9; i > 0; --i) { - killnotify_times[i] = killnotify_times[i-1]; - killnotify_deathtype[i] = killnotify_deathtype[i-1]; - killnotify_actiontype[i] = killnotify_actiontype[i-1]; - if(killnotify_attackers[i]) - strunzone(killnotify_attackers[i]); - killnotify_attackers[i] = strzone(killnotify_attackers[i-1]); - if(killnotify_victims[i]) - strunzone(killnotify_victims[i]); - killnotify_victims[i] = strzone(killnotify_victims[i-1]); - } - killnotify_times[0] = time; - killnotify_deathtype[0] = wpn; - killnotify_actiontype[0] = actiontype; - if(killnotify_attackers[0]) - strunzone(killnotify_attackers[0]); - killnotify_attackers[0] = strzone(attacker); - if(killnotify_victims[0]) - strunzone(killnotify_victims[0]); - killnotify_victims[0] = strzone(victim); + --kn_index; + if (kn_index == -1) + kn_index = KN_MAX_ENTRIES-1; + killnotify_times[kn_index] = time; // -1 indicates the message is deleted + killnotify_deathtype[kn_index] = wpn; + killnotify_actiontype[kn_index] = actiontype; + if(killnotify_attackers[kn_index]) + strunzone(killnotify_attackers[kn_index]); + killnotify_attackers[kn_index] = strzone(attacker); + if(killnotify_victims[kn_index]) + strunzone(killnotify_victims[kn_index]); + killnotify_victims[kn_index] = strzone(victim); } void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s1 = attacker, s2 = victim @@ -2654,6 +2645,9 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s alsoprint = (cvar("hud_panel_notify_print") || !panel_enabled); // print message to console if: notify panel disabled, or cvar to do so enabled gentle = (cvar("cl_gentle") || cvar("cl_gentle_messages")); + if ((msg == MSG_SUICIDE || msg == MSG_KILL || msg == MSG_KILL_ACTION) && gametype == GAME_CTS) // selfkill isn't interesting in CTS and only spams up the notify panel + return; + if(msg == MSG_SUICIDE) { w = DEATH_WEAPONOF(type); if(WEP_VALID(w)) { @@ -2699,9 +2693,14 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s } else if(msg == MSG_KILL) { w = DEATH_WEAPONOF(type); if(WEP_VALID(w)) { - HUD_KillNotify_Push(s1, s2, 1, type); - if (alsoprint) - print("^1", sprintf(Weapon_KillMessage(type), strcat(s2, "^1"), strcat(s1, "^1")), "\n"); // default order: victim, killer + if(type & HITTYPE_HEADSHOT) + HUD_KillNotify_Push(s1, s2, 1, DEATH_HEADSHOT); + else + { + HUD_KillNotify_Push(s1, s2, 1, type); + if (alsoprint) + print("^1", sprintf(Weapon_KillMessage(type), strcat(s2, "^1"), strcat(s1, "^1")), "\n"); // default order: victim, killer + } } else if(type == KILL_TEAM_RED || type == KILL_TEAM_BLUE || type == KILL_TEAM_SPREE) { HUD_KillNotify_Push(s1, s2, 1, type); @@ -2980,6 +2979,19 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s HUD_KillNotify_Push(s1, s2, 0, INFO_CAPTUREFLAG); print(s1, "^7 captured the ", s2, s3, "\n"); } + } else if(msg == MSG_RACE) { + if(type == RACE_SERVER_RECORD) { + HUD_KillNotify_Push(s1, s2, 1, RACE_SERVER_RECORD); + } + else if(type == RACE_NEW_RANK) { + HUD_KillNotify_Push(s1, s2, 1, RACE_NEW_RANK); + } + else if(type == RACE_NEW_TIME) { + HUD_KillNotify_Push(s1, s2, 1, RACE_NEW_TIME); + } + else if(type == RACE_FAIL) { + HUD_KillNotify_Push(s1, s2, 1, RACE_FAIL); + } } } @@ -3091,7 +3103,7 @@ void HUD_Notify (void) } float entries, height; - entries = bound(1, floor(10 * mySize_y/mySize_x), 10); + entries = bound(1, floor(KN_MAX_ENTRIES * mySize_y/mySize_x), KN_MAX_ENTRIES); height = mySize_y/entries; vector fontsize; @@ -3110,43 +3122,68 @@ void HUD_Notify (void) float width_attacker; string attacker, victim; - float i, j, w; - float flip = cvar("hud_panel_notify_flip"); - for(j = 0; j < entries; ++j) + float i, j, w, step, limit; + if(cvar("hud_panel_notify_flip")) //order items from the top down { - s = ""; - if(flip) - i = j; - else // rather nasty hack for ordering items from the bottom up - i = entries - j - 1; + i = 0; + step = +1; + limit = entries; + } + else //order items from the bottom up + { + i = entries - 1; + step = -1; + limit = -1; + } - if(fadetime) + for(j = kn_index; i != limit; i += step, ++j) + { + if(autocvar__hud_configure) { - if(killnotify_times[j] + when > time) - a = 1; - else - a = bound(0, (killnotify_times[j] + when + fadetime - time) / fadetime, 1); + if (step == +1) + a = i; + else // inverse order + a = entries - 1 - i; + attacker = textShortenToWidth(strcat("Player", ftos(a+1)), 0.48 * mySize_x - height, fontsize, stringwidth_colors); + victim = textShortenToWidth(strcat("Player", ftos(a+2)), 0.48 * mySize_x - height, fontsize, stringwidth_colors); + s = strcat("weapon", get_weaponinfo(WEP_FIRST + mod(floor(a*2.4), WEP_LAST)).netname); + a = bound(0, (when - a) / 4, 1); + goto hud_config_notifyprint; + } + + if (j == KN_MAX_ENTRIES) + j = 0; + + if (killnotify_times[j] == -1) + break; + + if(killnotify_times[j] + when > time) + a = 1; + else if(fadetime) + { + a = bound(0, (killnotify_times[j] + when + fadetime - time) / fadetime, 1); + if(!a) + { + killnotify_times[j] = -1; + break; + } } else { - if(killnotify_times[j] + when > time) - a = 1; - else - a = 0; + killnotify_times[j] = -1; + break; } + s = ""; + w = -1; w = DEATH_WEAPONOF(killnotify_deathtype[j]); // TODO: maybe print in team colors? // // Y [used by] X - if(killnotify_actiontype[j] == 0 && !autocvar__hud_configure) + if(killnotify_actiontype[j] == 0) { - attacker = textShortenToWidth(killnotify_attackers[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors); - pos_attacker = pos + eX * (0.52 * mySize_x + height) + eY * (0.5 * fontsize_y + i * height); - weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height; - if(killnotify_deathtype[j] == DEATH_GENERIC) { s = "notify_death"; @@ -3239,7 +3276,11 @@ void HUD_Notify (void) s = "notify_blue_captured"; } } - if(s != "" && a) + attacker = textShortenToWidth(killnotify_attackers[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors); + pos_attacker = pos + eX * (0.52 * mySize_x + height) + eY * (0.5 * fontsize_y + i * height); + weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height; + + if(s != "") { drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); @@ -3248,27 +3289,7 @@ void HUD_Notify (void) // X [did action to] Y else { - if(autocvar__hud_configure) - { - attacker = textShortenToWidth("Player1", 0.48 * mySize_x - height, fontsize, stringwidth_colors); - victim = textShortenToWidth("Player2", 0.48 * mySize_x - height, fontsize, stringwidth_colors); - a = bound(0, (when - j) / 4, 1); - } - else - { - attacker = textShortenToWidth(killnotify_attackers[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors); - victim = textShortenToWidth(killnotify_victims[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors); - } - width_attacker = stringwidth(attacker, TRUE, fontsize); - pos_attacker = pos + eX * (0.48 * mySize_x - height - width_attacker) + eY * (0.5 * fontsize_y + i * height); - pos_victim = pos + eX * (0.52 * mySize_x + height) + eY * (0.5 * fontsize_y + i * height); - weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height; - - if(autocvar__hud_configure) // example actions for config mode - { - s = "weaponelectro"; - } - else if(killnotify_deathtype[j] & HITTYPE_SECONDARY && w == WEP_LASER) + if(killnotify_deathtype[j] & HITTYPE_SECONDARY && w == WEP_LASER) { s = "notify_melee_laser"; } @@ -3317,7 +3338,36 @@ void HUD_Notify (void) { s = "notify_void"; } - if(s != "" && a) + else if(killnotify_deathtype[j] == DEATH_HEADSHOT) + { + s = "notify_headshot"; + } + else if(killnotify_deathtype[j] == RACE_SERVER_RECORD) + { + s = "race_newrecordserver"; + } + else if(killnotify_deathtype[j] == RACE_NEW_RANK) + { + s = "race_newrankyellow"; + } + else if(killnotify_deathtype[j] == RACE_NEW_TIME) + { + s = "race_newtime"; + } + else if(killnotify_deathtype[j] == RACE_FAIL) + { + s = "race_newfail"; + } + + attacker = textShortenToWidth(killnotify_attackers[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors); + victim = textShortenToWidth(killnotify_victims[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors); +:hud_config_notifyprint + width_attacker = stringwidth(attacker, TRUE, fontsize); + pos_attacker = pos + eX * (0.48 * mySize_x - height - width_attacker) + eY * (0.5 * fontsize_y + i * height); + pos_victim = pos + eX * (0.52 * mySize_x + height) + eY * (0.5 * fontsize_y + i * height); + weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height; + + if(s != "") { drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); @@ -3528,7 +3578,7 @@ void HUD_Radar(void) // void HUD_Score(void) { - if(!autocvar_hud_panel_score && !autocvar__hud_configure) + if(!autocvar__hud_configure && !autocvar_hud_panel_score) return; active_panel = HUD_PANEL_SCORE; @@ -3545,6 +3595,7 @@ void HUD_Score(void) } float score, distribution, leader; + string sign; vector distribution_color; entity tm, pl, me; me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1]; @@ -3566,15 +3617,17 @@ void HUD_Score(void) // distribution display distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]); - distrtimer = ftos(distribution/pow(10, TIME_DECIMALS)); + distrtimer = ftos_decimals(fabs(distribution/pow(10, TIME_DECIMALS)), TIME_DECIMALS); if (distribution <= 0) { distribution_color = '0 1 0'; + sign = "-"; } else { distribution_color = '1 0 0'; + sign = "+"; } - drawstring_aspect(pos + eX * 0.75 * mySize_x, distrtimer, eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eX * 0.75 * mySize_x, strcat(sign, distrtimer), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL); } // race record display if (distribution <= 0) @@ -3583,6 +3636,26 @@ void HUD_Score(void) drawstring_aspect(pos, timer, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); drawfont = hud_font; } else if (!teamplay) { // non-teamgames + if (spectatee_status == -1) + { +#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); + float height = mySize_y/entries; + vector fontsize = '0.9 0.9 0' * height; + pos_y += height * (1 - 0.9) / 2; + + float name_size = mySize_x*0.75; + float i, name_pos; + for (pl = players.sort_next, i=0; pl && i 3) + { + newSize = 3 * score_size_y; + offset_x = score_size_x - newSize; + pos_x += offset_x/2; + score_size_x = newSize; + } + else + { + newSize = 1/3 * score_size_x; + offset_y = score_size_y - newSize; + pos_y += offset_y/2; + score_size_y = newSize; + } + } + else + score_size = eX * mySize_x*(1/4) + eY * mySize_y*(1/3); for(tm = teams.sort_next; tm; tm = tm.sort_next) { - if(tm.team == COLOR_SPECTATOR || (!tm.team_size && !autocvar__hud_configure)) // no players? don't display + if(tm.team == COLOR_SPECTATOR) continue; score = tm.(teamscores[ts_primary]); if(autocvar__hud_configure) score = 123; - leader = 0; if (score > max_fragcount) max_fragcount = score; - if(tm.team == myteam) { + if (spectatee_status == -1) + { + score_pos = pos + eX * column * (score_size_x + offset_x) + eY * row * (score_size_y + offset_y); + if (max_fragcount == score) + HUD_Panel_DrawHighlight(score_pos, score_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawfont = hud_bigfont; + drawstring_aspect(score_pos, ftos(score), score_size, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); + drawfont = hud_font; + ++row; + if(row >= rows) + { + row = 0; + ++column; + } + } + else if(tm.team == myteam) { if (max_fragcount == score) - leader = 1; - if (leader) HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); drawfont = hud_bigfont; drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); drawfont = hud_font; } else { if (max_fragcount == score) - leader = 1; - if (leader) - HUD_Panel_DrawHighlight(pos + eX * 0.75 * mySize_x + eY * (1/3) * teamnum * mySize_y, eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawstring_aspect(pos + eX * 0.75 * mySize_x + eY * (1/3) * teamnum * mySize_y, ftos(score), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); - teamnum += 1; + HUD_Panel_DrawHighlight(pos + eX * 0.75 * mySize_x + eY * (1/3) * rows * mySize_y, score_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eX * 0.75 * mySize_x + eY * (1/3) * rows * mySize_y, ftos(score), score_size, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); + ++rows; } } } @@ -3655,8 +3775,12 @@ void HUD_Score(void) // Race timer (#8) // void HUD_RaceTimer (void) { - if(!autocvar_hud_panel_racetimer && !(gametype == GAME_RACE || gametype == GAME_CTS) && !autocvar__hud_configure) - return; + if(!autocvar__hud_configure) + { + if(!autocvar_hud_panel_racetimer) return; + if(!(gametype == GAME_RACE || gametype == GAME_CTS)) return; + if(spectatee_status == -1) return; + } active_panel = HUD_PANEL_RACETIMER; HUD_Panel_UpdateCvars(racetimer); @@ -3807,6 +3931,12 @@ float vote_change; // "time" when vote_active changed void HUD_VoteWindow(void) { + if(autocvar_cl_allow_uid2name == -1 && (gametype == GAME_CTS || gametype == GAME_RACE)) + { + vote_active = 1; + vote_called_vote = strzone(strcat("^2Name ^7instead of \"^1Unregistered player\"", " ^7in stats")); + } + if(!autocvar_hud_panel_vote && !autocvar__hud_configure) return; @@ -3849,6 +3979,12 @@ void HUD_VoteWindow(void) pos = panel_pos; mySize = panel_size; + if(autocvar_cl_allow_uid2name == -1 && (gametype == GAME_CTS || gametype == GAME_RACE)) + { + panel_pos = eX * 0.3 * vid_conwidth + eY * 0.1 * vid_conheight; + panel_size = eX * 0.4 * vid_conwidth + eY * 0.3 * vid_conheight; + } + a = vote_alpha * bound(cvar("hud_panel_vote_alreadyvoted_alpha"), 1 - vote_highlighted, 1); HUD_Panel_DrawBg(a); a = panel_fg_alpha * a; @@ -3878,16 +4014,22 @@ void HUD_VoteWindow(void) mySize = newSize; s = "A vote has been called for:"; + if(autocvar_cl_allow_uid2name == -1 && (gametype == GAME_CTS || gametype == GAME_RACE)) + s = "Allow servers to store and display your name?"; drawstring_aspect(pos, s, eX * mySize_x + eY * (2/8) * mySize_y, '1 1 1', a, DRAWFLAG_NORMAL); - s = textShortenToWidth(vote_called_vote, mySize_x, '1 1 0' * mySize_y * (1.75/8), stringwidth_colors); + s = textShortenToWidth(vote_called_vote, mySize_x, '1 1 0' * mySize_y * (1/8), stringwidth_colors); if(autocvar__hud_configure) s = "^1Configure the HUD"; drawcolorcodedstring_aspect(pos + eY * (2/8) * mySize_y, s, eX * mySize_x + eY * (1.75/8) * mySize_y, a, DRAWFLAG_NORMAL); // print the yes/no counts s = strcat("Yes (", getcommandkey("vyes", "vyes"), "): ", ftos(vote_yescount)); + if(autocvar_cl_allow_uid2name == -1 && (gametype == GAME_CTS || gametype == GAME_RACE)) + s = strcat("Yes: (press y)"); drawstring_aspect(pos + eY * (4/8) * mySize_y, s, eX * 0.5 * mySize_x + eY * (1.5/8) * mySize_y, '0 1 0', a, DRAWFLAG_NORMAL); s = strcat("No (", getcommandkey("vno", "vno"), "): ", ftos(vote_nocount)); + if(autocvar_cl_allow_uid2name == -1 && (gametype == GAME_CTS || gametype == GAME_RACE)) + s = strcat("No: (press n)"); drawstring_aspect(pos + eX * 0.5 * mySize_x + eY * (4/8) * mySize_y, s, eX * 0.5 * mySize_x + eY * (1.5/8) * mySize_y, '1 0 0', a, DRAWFLAG_NORMAL); // draw the progress bar backgrounds @@ -3904,11 +4046,17 @@ void HUD_VoteWindow(void) } // draw the progress bars - drawsetcliparea(pos_x, pos_y, mySize_x * 0.5 * (vote_yescount/vote_needed), mySize_y); - drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_prog", eX * mySize_x + eY * (3/8) * mySize_y, '1 1 1', a, DRAWFLAG_NORMAL); + if(vote_yescount && vote_needed) + { + drawsetcliparea(pos_x, pos_y, mySize_x * 0.5 * (vote_yescount/vote_needed), mySize_y); + drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_prog", eX * mySize_x + eY * (3/8) * mySize_y, '1 1 1', a, DRAWFLAG_NORMAL); + } - drawsetcliparea(pos_x + mySize_x - mySize_x * 0.5 * (vote_nocount/vote_needed), pos_y, mySize_x * 0.5, mySize_y); - drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_prog", eX * mySize_x + eY * (3/8) * mySize_y, '1 1 1', a, DRAWFLAG_NORMAL); + if(vote_nocount && vote_needed) + { + drawsetcliparea(pos_x + mySize_x - mySize_x * 0.5 * (vote_nocount/vote_needed), pos_y, mySize_x * 0.5, mySize_y); + drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_prog", eX * mySize_x + eY * (3/8) * mySize_y, '1 1 1', a, DRAWFLAG_NORMAL); + } drawresetcliparea(); @@ -5010,6 +5158,7 @@ switch (id) {\ void HUD_Main (void) { + float i; // global hud alpha fade if(menu_enabled == 1) hud_fade_alpha = 1; @@ -5040,7 +5189,6 @@ void HUD_Main (void) // HUD configure visible grid if(autocvar__hud_configure && autocvar_hud_configure_grid && autocvar_hud_configure_grid_alpha) { - float i; // x-axis for(i = 0; i < 1/bound(0.005, autocvar_hud_configure_grid_xsize, 0.2); ++i) {