X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qc;h=74c7b8d28b03ca801ebcea36678fe3f2c7e3a094;hb=b34fc8210b8f92e55a622147b1398f5e2899ab43;hp=c5ee428998d19362a008effa0651f939c95d9325;hpb=5ca5bf703d18009ceaaf329a13b5690c179b8232;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index c5ee42899..74c7b8d28 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -1692,18 +1692,10 @@ void HUD_Weapons(void) } float show_accuracy; - float weapon_stats, weapon_number; + float weapon_stats; if(cvar("hud_panel_weapons_accuracy") && acc_levels) { show_accuracy = true; - // hits - weapon_stats = getstati(STAT_DAMAGE_HITS); - weapon_number = weapon_stats & 63; - weapon_hits[weapon_number-WEP_FIRST] = floor(weapon_stats / 64); - // fired - weapon_stats = getstati(STAT_DAMAGE_FIRED); - weapon_number = weapon_stats & 63; - 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("accuracy_color", ftos(i)))); @@ -1726,13 +1718,9 @@ void HUD_Weapons(void) // draw the weapon accuracy if(show_accuracy) { - float weapon_hit, weapon_damage; - weapon_damage = weapon_fired[self.weapon-WEP_FIRST]; - if(weapon_damage) + weapon_stats = weapon_accuracy[self.weapon-WEP_FIRST]; + if(weapon_stats >= 0) { - weapon_hit = weapon_hits[self.weapon-WEP_FIRST]; - weapon_stats = floor(100 * weapon_hit / weapon_damage); - // find the max level lower than weapon_stats float j; j = acc_levels-1; @@ -2688,7 +2676,11 @@ 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((w == WEP_CAMPINGRIFLE || w == WEP_MINSTANEX) && type & HITTYPE_HEADSHOT) // all headshot weapons go here + 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 } @@ -2982,6 +2974,17 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s else if(type == RACE_FAIL) { HUD_KillNotify_Push(s1, s2, 1, RACE_FAIL); } + } else if(msg == MSG_KA) { + if(type == KA_PICKUPBALL) { + HUD_KillNotify_Push(s1, s2, 0, KA_PICKUPBALL); + if(alsoprint) + print (s1, "^7 has picked up the ball!\n"); + } + else if(type == KA_DROPBALL) { + HUD_KillNotify_Push(s1, s2, 0, KA_DROPBALL); + if(alsoprint) + print(s1, "^7 has dropped the ball!\n"); + } } } @@ -3125,40 +3128,50 @@ void HUD_Notify (void) step = -1; limit = -1; } + for(j = kn_index; i != limit; i += step, ++j) { + if(autocvar__hud_configure) + { + 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; - s = ""; - - if(fadetime) + if(killnotify_times[j] + when > time) + a = 1; + else if(fadetime) { - if(killnotify_times[j] + when > time) - a = 1; - else - a = bound(0, (killnotify_times[j] + when + fadetime - time) / fadetime, 1); + a = bound(0, (killnotify_times[j] + when + fadetime - time) / fadetime, 1); + if(!a) + { + break; + } } else { - if(killnotify_times[j] + when > time) - a = 1; - else - a = 0; + 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"; @@ -3251,40 +3264,29 @@ void HUD_Notify (void) s = "notify_blue_captured"; } } - if(s != "" && a) - { - 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); - } - } - // X [did action to] Y - else - { - if(autocvar__hud_configure) + else if(killnotify_deathtype[j] == KA_DROPBALL) { - attacker = textShortenToWidth("Player1", 0.48 * mySize_x - height, fontsize, stringwidth_colors); - victim = textShortenToWidth("Player2", 0.48 * mySize_x - height, fontsize, stringwidth_colors); - if (step == +1) - a = i; - else // inverse order - a = entries - 1 - i; - a = bound(0, (when - a) / 4, 1); + s = "notify_blue_lost"; } - else + else if(killnotify_deathtype[j] == KA_PICKUPBALL) { - 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); + s = "notify_blue_captured"; } - 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); + + 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(autocvar__hud_configure) // example actions for config mode + if(s != "") { - s = "weaponelectro"; + 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); } - else if(killnotify_deathtype[j] & HITTYPE_SECONDARY && w == WEP_LASER) + } + // X [did action to] Y + else + { + if(killnotify_deathtype[j] & HITTYPE_SECONDARY && w == WEP_LASER) { s = "notify_melee_laser"; } @@ -3333,6 +3335,10 @@ void HUD_Notify (void) { s = "notify_void"; } + else if(killnotify_deathtype[j] == DEATH_HEADSHOT) + { + s = "notify_headshot"; + } else if(killnotify_deathtype[j] == RACE_SERVER_RECORD) { s = "race_newrecordserver"; @@ -3349,7 +3355,16 @@ void HUD_Notify (void) { s = "race_newfail"; } - if(s != "" && a) + + 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); @@ -3957,11 +3972,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(); @@ -4302,6 +4323,19 @@ void HUD_Mod_KH(vector pos, vector mySize) } } +// Keepaway HUD mod icon +void HUD_Mod_Keepaway(vector pos, vector mySize) +{ + float stat_items; + stat_items = getstati(STAT_ITEMS); + + mod_active = 1; + + if(stat_items & IT_KEY1) + drawpic_aspect_skin(pos, "keepawayball_carrying", eX * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); +} + + // Nexball HUD mod icon void HUD_Mod_NexBall(vector pos, vector mySize) { @@ -4502,7 +4536,7 @@ void HUD_ModIcons(void) if(!autocvar_hud_panel_modicons && !autocvar__hud_configure) return; - if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && gametype != GAME_CA && !autocvar__hud_configure) + if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && gametype != GAME_CA && gametype != GAME_KEEPAWAY && !autocvar__hud_configure) return; active_panel = HUD_PANEL_MODICONS; @@ -4541,6 +4575,8 @@ void HUD_ModIcons(void) HUD_Mod_Race(pos, mySize); else if(gametype == GAME_CA) HUD_Mod_CA(pos, mySize); + else if(gametype == GAME_KEEPAWAY) + HUD_Mod_Keepaway(pos, mySize); } // Draw pressed keys (#11)