X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qc;h=3e3663db5a90b99e95838e61b0180a61e5867577;hp=ffd95f4feff69a5896f1fab4ef85e62ce9cd6082;hb=707b95ea2f5399ce787bc7a1087d211bd851d4ff;hpb=834876e6b179cf33ce95102ba25faf754e9a8773 diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index ffd95f4fe..3e3663db5 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"); @@ -241,6 +244,30 @@ float race_CheckName(string net_name) { return 0; } +float GetPlayerColorForce(float i) +{ + if(!teamplay) + return 0; + else + return stof(getplayerkeyvalue(i, "colors")) & 15; +} + +float GetPlayerColor(float i) +{ + if not(playerslots[i].gotscores) // unconnected + return FL_SPECTATOR; + else if(stof(getplayerkeyvalue(i, "frags")) == FRAGS_SPECTATOR) + return FL_SPECTATOR; + else + return GetPlayerColorForce(i); +} + +string GetPlayerName(float i) +{ + return ColorTranslateRGB(getplayerkeyvalue(i, "name")); +} + + /* ================== HUD panels @@ -434,27 +461,29 @@ void HUD_Weapons(void) // declarations WEPSET_DECLARE_A(weapons_stat); 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 i, f, a; + float screen_ar, center_x = 0, center_y; + float weapon_count, weapon_id; float row, column, rows, columns; float aspect = autocvar_hud_panel_weapons_aspect; - float show_accuracy, panel_weapon_accuracy; + float 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; } @@ -463,7 +492,8 @@ void HUD_Weapons(void) { if((!autocvar_hud_panel_weapons) || (spectatee_status == -1)) return; - else if(timeout && time >= weapontime + timeout + timeout_effect_length) + if(timeout && time >= weapontime + timeout + timeout_effect_length) + if(autocvar_hud_panel_weapons_timeout_effect == 3 || (autocvar_hud_panel_weapons_timeout_effect == 1 && !(autocvar_hud_panel_weapons_timeout_fadebgmin + autocvar_hud_panel_weapons_timeout_fadefgmin))) { weaponprevtime = time; return; @@ -476,14 +506,7 @@ void HUD_Weapons(void) HUD_Panel_UpdateCvars(weapons); HUD_Panel_ApplyFadeAlpha(); - // 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; + draw_beginBoldFont(); // figure out weapon order (how the weapons are sorted) // TODO make this configurable if(weaponorder_bypriority != autocvar_cl_weaponpriority || !weaponorder[0]) @@ -529,6 +552,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; @@ -564,12 +588,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 @@ -590,17 +623,28 @@ void HUD_Weapons(void) else //top panel_pos_y -= f * (panel_pos_y + panel_size_y); } + if(f == 1) + center_x = -1; // mark the panel as off screen } weaponprevtime = time - (1 - f) * timein_effect_length; } 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 @@ -628,6 +672,10 @@ void HUD_Weapons(void) // draw the background, then change the virtual size of it to better fit other items inside HUD_Panel_DrawBg(1); + + if(center_x == -1) + return; + if(panel_bg_padding) { panel_pos += '1 1 0' * panel_bg_padding; @@ -659,15 +707,10 @@ void HUD_Weapons(void) baroffset_y = (weapon_size_y - barsize_y) / 2; } } + if(autocvar_hud_panel_weapons_accuracy) + Accuracy_LoadColors(); - if(autocvar_hud_panel_weapons_accuracy && acc_levels) - { - show_accuracy = true; - if (acc_col[0] == '-1 0 0') - for (i = 0; i < acc_levels; ++i) - 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 @@ -692,24 +735,15 @@ 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) + if(autocvar_hud_panel_weapons_accuracy) { panel_weapon_accuracy = weapon_accuracy[self.weapon-WEP_FIRST]; if(panel_weapon_accuracy >= 0) { - // find the max level lower than weapon_accuracy - j = acc_levels-1; - while ( j && panel_weapon_accuracy < acc_lev[j] ) - --j; - - // inject color j+1 in color j, how much depending on how much weapon_accuracy is higher than level j - factor = (panel_weapon_accuracy - acc_lev[j]) / (acc_lev[j+1] - acc_lev[j]); - color = acc_col[j]; - color = color + factor * (acc_col[j+1] - color); - + color = Accuracy_GetColor(panel_weapon_accuracy); drawpic_aspect_skin(weapon_pos, "weapon_accuracy", weapon_size, color, panel_fg_alpha, DRAWFLAG_NORMAL); } } @@ -718,7 +752,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) @@ -808,6 +842,8 @@ void HUD_Weapons(void) ++column; } } + + draw_endBoldFont(); } // Ammo (#1) @@ -908,6 +944,9 @@ void HUD_Ammo(void) HUD_Panel_UpdateCvars(ammo); HUD_Panel_ApplyFadeAlpha(); + + draw_beginBoldFont(); + vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -919,7 +958,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; @@ -934,7 +973,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) { @@ -958,40 +997,46 @@ void HUD_Ammo(void) if(autocvar__hud_configure) { DrawAmmoItem(pos, ammo_size, 2, true, FALSE); //show rockets - return; } + else + { + stat_items = getstati(STAT_ITEMS, 0, 24); + if (stat_items & IT_UNLIMITED_WEAPON_AMMO) + infinite_ammo = TRUE; + for (i = 0; i < AMMO_COUNT; ++i) { + currently_selected = stat_items & GetAmmoItemCode(i); + if (currently_selected) + { + DrawAmmoItem(pos, ammo_size, i, true, infinite_ammo); + break; + } + } + } + } + else + { 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); - if (currently_selected) + DrawAmmoItem(pos + eX * column * (ammo_size_x + offset_x) + eY * row * (ammo_size_y + offset_y), ammo_size, i, currently_selected, infinite_ammo); + ++row; + if(row >= rows) { - DrawAmmoItem(pos, ammo_size, i, true, infinite_ammo); - return; + row = 0; + column = column + 1; } } - return; // nothing to display } - stat_items = getstati(STAT_ITEMS, 0, 24); - if (stat_items & IT_UNLIMITED_WEAPON_AMMO) - infinite_ammo = TRUE; - 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); - ++row; - if(row >= rows) - { - row = 0; - column = column + 1; - } - } + draw_endBoldFont(); } 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) @@ -1107,6 +1152,9 @@ void HUD_Powerups(void) HUD_Panel_UpdateCvars(powerups); HUD_Panel_ApplyFadeAlpha(); + + draw_beginBoldFont(); + vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -1120,7 +1168,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; @@ -1213,7 +1261,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; @@ -1273,6 +1321,8 @@ void HUD_Powerups(void) DrawNumIcon_expanding(pos + superweapons_offset, mySize, superweapons, "superweapons", is_vertical, superweapons_iconalign, '1 1 1', 1, bound(0, (superweapons - superweapons_time) / 0.5, 1)); } } + + draw_endBoldFont(); } // Health/armor (#3) @@ -1408,7 +1458,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; @@ -1581,31 +1631,10 @@ string Weapon_KillMessage(float deathtype) return w_deathtypestring; } -#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) -{ - --kn_index; - if (kn_index == -1) - kn_index = KN_MAX_ENTRIES-1; - killnotify_times[kn_index] = time; - 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 { + /* float w; float alsoprint, gentle; alsoprint = (autocvar_hud_panel_notify_print || !panel_enabled); // print message to console if: notify panel disabled, or cvar to do so enabled @@ -1745,11 +1774,15 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s } else if(type == DEATH_SBBLOWUP) { HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC); if(alsoprint) - print (sprintf(_("^1%s^1 got caught in the destruction of %s^1's vehicle\n"), s2, s1)); + print (sprintf(_("^1%s^1 got caught in the blast when %s^1's destroys a vehicle\n"), s2, s1)); } else if(type == DEATH_WAKIGUN) { HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC); if(alsoprint) print (sprintf(_("^1%s^1 was bolted down by %s\n"), s2, s1)); + } else if(type == DEATH_BUMB_GUN) { + HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC); + if(alsoprint) + print (sprintf(_("^1%s^1 saw %s's preddy lights.\n"), s2, s1)); } else if(type == DEATH_WAKIROCKET) { HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC); if(alsoprint) @@ -1757,7 +1790,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s } else if(type == DEATH_WAKIBLOWUP) { HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC); if(alsoprint) - print (sprintf(_("^1%s^1 dies when %s^1's wakizashi dies.\n"), s2, s1)); + print (sprintf(_("^1%s^1 got caught in the blast when %s^1's destroys a vehicle\n"), s2, s1)); } else if(type == DEATH_RAPTOR_CANNON) { HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC); if(alsoprint) @@ -1769,7 +1802,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s } else if(type == DEATH_RAPTOR_DEATH) { HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC); if(alsoprint) - print (sprintf(_("^1%s^1 dies when %s^1's raptor dies.\n"), s2, s1)); + print (sprintf(_("^1%s^1 got caught in the blast when %s^1's destroys a vehicle\n"), s2, s1)); } else if(type == DEATH_TURRET) { HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC); if(alsoprint) @@ -2021,97 +2054,10 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s if(alsoprint) print(sprintf(_("%s^7 has dropped the ball!\n"), s1)); } - } + }*/ } -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) +void HUD_Notify(void) { if(!autocvar__hud_configure) { @@ -2147,14 +2093,11 @@ void HUD_Notify (void) float fadetime; fadetime = autocvar_hud_panel_notify_fadetime; - string s; - - vector pos_attacker, pos_victim; - vector weap_pos; + vector pos_attacker, pos_victim, pos_icon; float width_attacker; - string attacker, victim; + 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; @@ -2178,234 +2121,62 @@ void HUD_Notify (void) a = entries - 1 - i; attacker = textShortenToWidth(sprintf(_("Player %d"), a+1), 0.48 * mySize_x - height, fontsize, stringwidth_colors); victim = textShortenToWidth(sprintf(_("Player %d"), 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); + icon = 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] + when > time) - a = 1; - else if(fadetime) - { - a = bound(0, (killnotify_times[j] + when + fadetime - time) / fadetime, 1); - if(!a) - { - break; - } - } else { - break; - } - - s = ""; + if (j == KN_MAX_ENTRIES) + j = 0; - type = killnotify_deathtype[j]; - w = DEATH_WEAPONOF(type); - - // TODO: maybe print in team colors? - // - // Y [used by] X - if(killnotify_actiontype[j] == 0) - { - if(type == DEATH_GENERIC) - { - s = "notify_death"; - } - else if(type == DEATH_NOAMMO) - { - s = "notify_outofammo"; - } - else if(type == DEATH_KILL) - { - s = "notify_selfkill"; - } - else if(type == DEATH_CAMP) - { - s = "notify_camping"; - } - else if(type == KILL_TEAM_RED) - { - s = "notify_teamkill_red"; - } - else if(type == KILL_TEAM_BLUE) - { - s = "notify_teamkill_blue"; - } - else if(type == DEATH_DROWN) - { - s = "notify_water"; - } - else if(type == DEATH_SLIME) - { - s = "notify_slime"; - } - else if(type == DEATH_LAVA) - { - s = "notify_lava"; - } - else if(type == DEATH_FALL) - { - s = "notify_fall"; - } - else if(type == DEATH_SHOOTING_STAR) - { - s = "notify_shootingstar"; - } - else if(type == DEATH_HURTTRIGGER || type == DEATH_CUSTOM) - { - s = "notify_death"; - } - else if(type == INFO_GOTFLAG) - { - if(killnotify_victims[j] == "^1RED^7 flag") - { - s = "notify_red_taken"; - } - else - { - s = "notify_blue_taken"; - } - } - else if(type == INFO_RETURNFLAG) - { - if(killnotify_victims[j] == "^1RED^7 flag") - { - s = "notify_red_returned"; - } - else - { - s = "notify_blue_returned"; - } - } - else if(type == INFO_LOSTFLAG) - { - if(killnotify_victims[j] == "^1RED^7 flag") - { - s = "notify_red_lost"; - } - else - { - s = "notify_blue_lost"; - } - } - else if(type == INFO_CAPTUREFLAG) + if(killnotify_times[j] + when > time) + a = 1; + else if(fadetime) { - if(killnotify_victims[j] == "^1RED^7 flag") - { - s = "notify_red_captured"; - } - else + a = bound(0, (killnotify_times[j] + when + fadetime - time) / fadetime, 1); + if(!a) { - s = "notify_blue_captured"; + break; } } - else if(type == KA_DROPBALL) - { - s = "notify_balldropped"; - } - else if(type == KA_PICKUPBALL) + else { - s = "notify_ballpickedup"; + break; } - 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) + (0.5 * (height - fontheight))); - 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); - } + attacker = killnotify_attackers[j]; + victim = killnotify_victims[j]; + icon = killnotify_icon[j]; } - // X [did action to] Y - else + + //type = killnotify_deathtype[j]; + //w = DEATH_WEAPONOF(type); + + if(icon != "") { - if(type & HITTYPE_SECONDARY && w == WEP_LASER) - { - s = "notify_melee_laser"; - } - else if(type & HITTYPE_SECONDARY && w == WEP_SHOTGUN) - { - s = "notify_melee_shotgun"; - } - else if(type & HITTYPE_HEADSHOT && (w == WEP_RIFLE || w == WEP_MINSTANEX)) // all headshot weapons go here - { - s = "notify_headshot"; - } - else if(WEP_VALID(w)) - { - self = get_weaponinfo(w); - s = strcat("weapon", self.netname); - } - else if(type == KILL_TEAM_RED) - { - s = "notify_teamkill_red"; - } - else if(type == KILL_TEAM_BLUE) - { - s = "notify_teamkill_red"; - } - else if(type == DEATH_TELEFRAG) - { - s = "notify_telefrag"; - } - else if(type == DEATH_DROWN) - { - s = "notify_water"; - } - else if(type == DEATH_SLIME) - { - s = "notify_slime"; - } - else if(type == DEATH_LAVA) - { - s = "notify_lava"; - } - else if(type == DEATH_FALL) - { - s = "notify_fall"; - } - else if(type == DEATH_SHOOTING_STAR) - { - s = "notify_shootingstar"; - } - else if(type == DEATH_HURTTRIGGER || type == DEATH_CUSTOM) // DEATH_CUSTOM is also void, right? - { - s = "notify_void"; - } - else if(type == RACE_SERVER_RECORD) - { - s = "race_newrecordserver"; - } - else if(type == RACE_NEW_RANK) + if((attacker != "") && (victim == "")) { - s = "race_newrankyellow"; - } - else if(type == RACE_NEW_TIME) - { - s = "race_newtime"; + // Y [used by] X + attacker = textShortenToWidth(attacker, 0.73 * mySize_x - height, fontsize, stringwidth_colors); + pos_attacker = pos + eX * (0.27 * mySize_x + height) + eY * ((0.5 * fontsize_y + i * height) + (0.5 * (height - fontheight))); + pos_icon = pos + eX * 0.25 * mySize_x - eX * height + eY * i * height; + + drawpic_aspect_skin(pos_icon, icon, '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(type == RACE_FAIL) + else if((attacker != "") && (victim != "")) { - 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); + // X [did action to] Y + attacker = textShortenToWidth(attacker, 0.48 * mySize_x - height, fontsize, stringwidth_colors); + victim = textShortenToWidth(victim, 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) + (0.5 * (height - fontheight))); - pos_victim = pos + eX * (0.52 * mySize_x + height) + eY * ((0.5 * fontsize_y + i * height) + (0.5 * (height - fontheight))); - weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height; + width_attacker = stringwidth(attacker, TRUE, fontsize); + pos_attacker = pos + eX * (0.48 * mySize_x - height - width_attacker) + eY * ((0.5 * fontsize_y + i * height) + (0.5 * (height - fontheight))); + pos_victim = pos + eX * (0.52 * mySize_x + height) + eY * ((0.5 * fontsize_y + i * height) + (0.5 * (height - fontheight))); + pos_icon = 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); + drawpic_aspect_skin(pos_icon, icon, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos_victim, victim, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); } @@ -2436,6 +2207,9 @@ void HUD_Timer(void) HUD_Panel_UpdateCvars(timer); HUD_Panel_ApplyFadeAlpha(); + + draw_beginBoldFont(); + vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -2478,6 +2252,8 @@ void HUD_Timer(void) } drawstring_aspect(pos, timer, mySize, timer_color, panel_fg_alpha, DRAWFLAG_NORMAL); + + draw_endBoldFont(); } // Radar (#6) @@ -2621,8 +2397,8 @@ void HUD_Radar(void) for(tm = world; (tm = find(tm, classname, "entcs_receiver")); ) { color2 = GetPlayerColor(tm.sv_entnum); - //if(color == COLOR_SPECTATOR || color == color2) - draw_teamradar_player(tm.origin, tm.angles, GetTeamRGB(color2)); + //if(color == FL_SPECTATOR || color == color2) + draw_teamradar_player(tm.origin, tm.angles, Team_ColorRGB(color2)); } draw_teamradar_player(view_origin, view_angles, '1 1 1'); @@ -2635,7 +2411,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); @@ -2648,13 +2424,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 @@ -2663,7 +2437,7 @@ void HUD_Score_Rankings(vector pos, vector mySize, entity me, float team_count) for(i=0; i= 0) { if (distribution > 0) @@ -2863,13 +2640,14 @@ void HUD_Score(void) } drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL); 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) { - for(tm = teams.sort_next; tm, tm.team != COLOR_SPECTATOR; tm = tm.sort_next) + for(tm = teams.sort_next; tm, tm.team != FL_SPECTATOR; tm = tm.sort_next) ++scores_count; if (autocvar_hud_panel_score_rankings) { @@ -2905,8 +2683,10 @@ 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 == COLOR_SPECTATOR) + if(tm.team == FL_SPECTATOR) continue; score = tm.(teamscores[ts_primary]); if(autocvar__hud_configure) @@ -2920,7 +2700,7 @@ void HUD_Score(void) 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); - drawstring_aspect(score_pos, ftos(score), score_size, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(score_pos, ftos(score), score_size, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); ++row; if(row >= rows) { @@ -2931,14 +2711,15 @@ void HUD_Score(void) else if(tm.team == myteam) { if (max_fragcount == score) HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); } else { if (max_fragcount == score) 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); + drawstring_aspect(pos + eX * 0.75 * mySize_x + eY * (1/3) * rows * mySize_y, ftos(score), score_size, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); ++rows; } } + draw_endBoldFont(); } } @@ -2957,6 +2738,9 @@ void HUD_RaceTimer (void) HUD_Panel_UpdateCvars(racetimer); HUD_Panel_ApplyFadeAlpha(); + + draw_beginBoldFont(); + vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -2969,7 +2753,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; @@ -3061,13 +2845,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); } @@ -3085,6 +2869,8 @@ void HUD_RaceTimer (void) } } } + + draw_endBoldFont(); } // Vote window (#9) @@ -3178,7 +2964,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; @@ -3343,7 +3129,7 @@ void HUD_Mod_CTF(vector pos, vector mySize) case 2: red_icon = "flag_red_lost"; break; case 3: red_icon = "flag_red_carrying"; red_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; default: - if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2)) + if((stat_items & IT_CTF_SHIELDED) && (myteam == FL_TEAM_2)) red_icon = "flag_red_shielded"; else red_icon = string_null; @@ -3356,7 +3142,7 @@ void HUD_Mod_CTF(vector pos, vector mySize) default: if(redflag == 3) red_icon_prevstatus = "flag_red_carrying"; // make it more visible - else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2)) + else if((stat_items & IT_CTF_SHIELDED) && (myteam == FL_TEAM_2)) red_icon_prevstatus = "flag_red_shielded"; else red_icon_prevstatus = string_null; @@ -3371,7 +3157,7 @@ void HUD_Mod_CTF(vector pos, vector mySize) case 2: blue_icon = "flag_blue_lost"; break; case 3: blue_icon = "flag_blue_carrying"; blue_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; default: - if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1)) + if((stat_items & IT_CTF_SHIELDED) && (myteam == FL_TEAM_1)) blue_icon = "flag_blue_shielded"; else blue_icon = string_null; @@ -3384,7 +3170,7 @@ void HUD_Mod_CTF(vector pos, vector mySize) default: if(blueflag == 3) blue_icon_prevstatus = "flag_blue_carrying"; // make it more visible - else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1)) + else if((stat_items & IT_CTF_SHIELDED) && (myteam == FL_TEAM_1)) blue_icon_prevstatus = "flag_blue_shielded"; else blue_icon_prevstatus = string_null; @@ -3392,7 +3178,7 @@ void HUD_Mod_CTF(vector pos, vector mySize) } if(mySize_x > mySize_y) { - if (myteam == COLOR_TEAM1) { // always draw own flag on left + if (myteam == FL_TEAM_1) { // always draw own flag on left redflag_pos = pos; blueflag_pos = pos + eX * 0.5 * mySize_x; } else { @@ -3401,7 +3187,7 @@ void HUD_Mod_CTF(vector pos, vector mySize) } flag_size = eX * 0.5 * mySize_x + eY * mySize_y; } else { - if (myteam == COLOR_TEAM1) { // always draw own flag on left + if (myteam == FL_TEAM_1) { // always draw own flag on left redflag_pos = pos; blueflag_pos = pos + eY * 0.5 * mySize_y; } else { @@ -3438,7 +3224,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); @@ -3515,16 +3301,16 @@ void HUD_Mod_KH(vector pos, vector mySize) { switch(keyteam) { - case COLOR_TEAM1: + case FL_TEAM_1: drawpic_aspect_skin(pa, "kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% theAlpha key break; - case COLOR_TEAM2: + case FL_TEAM_2: drawpic_aspect_skin(pa, "kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% theAlpha key break; - case COLOR_TEAM3: + case FL_TEAM_3: drawpic_aspect_skin(pa, "kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% theAlpha key break; - case COLOR_TEAM4: + case FL_TEAM_4: drawpic_aspect_skin(pa, "kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% theAlpha key break; default: @@ -3755,6 +3541,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); @@ -3799,6 +3587,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: @@ -3816,10 +3609,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); @@ -3860,9 +3655,9 @@ 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 != COLOR_SPECTATOR) + if(tm.team != FL_SPECTATOR) ++teams_count; float layout = autocvar_hud_panel_modicons_dom_layout; @@ -3873,7 +3668,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; @@ -3996,10 +3796,17 @@ void HUD_DrawPressedKeys(void) } vector keysize; - keysize = eX * mySize_x * (1/3) + eY * mySize_y * 0.5; + keysize = eX * mySize_x * (1/3.0) + eY * mySize_y * (1/(3.0 - !autocvar_hud_panel_pressedkeys_attack)); float pressedkeys; pressedkeys = getstatf(STAT_PRESSED_KEYS); + if(autocvar_hud_panel_pressedkeys_attack) + { + drawpic_aspect_skin(pos + eX * keysize_x * 0.5, ((pressedkeys & KEY_ATCK) ? "key_atck_inv.tga" : "key_atck.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos + eX * keysize_x * 1.5, ((pressedkeys & KEY_ATCK2) ? "key_atck_inv.tga" : "key_atck.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + pos_y += keysize_y; + } + drawpic_aspect_skin(pos, ((pressedkeys & KEY_CROUCH) ? "key_crouch_inv.tga" : "key_crouch.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); drawpic_aspect_skin(pos + eX * keysize_x, ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); drawpic_aspect_skin(pos + eX * keysize_x * 2, ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); @@ -4180,7 +3987,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; @@ -4303,13 +4110,13 @@ 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) { for(; tm.sort_next; tm = tm.sort_next) { - if(!tm.team_size || tm.team == COLOR_SPECTATOR) + if(!tm.team_size || tm.team == FL_SPECTATOR) continue; if(!ts_min) ts_min = tm.team_size; else ts_min = min(ts_min, tm.team_size); @@ -4321,7 +4128,7 @@ void HUD_InfoMessages(void) s = strcat(blinkcolor, _("Teamnumbers are unbalanced!")); tm = GetTeam(myteam, false); if (tm) - if (tm.team != COLOR_SPECTATOR) + if (tm.team != FL_SPECTATOR) if (tm.team_size == ts_max) s = strcat(s, sprintf(_(" Press ^3%s%s to adjust"), getcommandkey("team menu", "menu_showteamselect"), blinkcolor)); drawInfoMessage(s) @@ -4360,6 +4167,8 @@ void HUD_Physics(void) HUD_Panel_UpdateCvars(physics); HUD_Panel_ApplyFadeAlpha(); + draw_beginBoldFont(); + HUD_Panel_DrawBg(1); if(panel_bg_padding) { @@ -4367,7 +4176,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; @@ -4440,7 +4249,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; @@ -4482,7 +4291,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; @@ -4541,12 +4350,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) @@ -4612,6 +4421,8 @@ void HUD_Physics(void) tmp_offset_y = (panel_size_y - tmp_size_y) / 2; if (autocvar_hud_panel_physics_text == 1 || autocvar_hud_panel_physics_text == 3) drawstring_aspect(panel_pos + acceleration_offset + tmp_offset, strcat(ftos_decimals(acceleration, 2), "g"), tmp_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + + draw_endBoldFont(); } // CenterPrint (#16) @@ -4790,7 +4601,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; @@ -4822,6 +4633,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); @@ -5002,11 +4815,14 @@ void HUD_Main (void) return; // Drawing stuff - if (hud_skin_path != autocvar_hud_skin) + if (hud_skin_prev != autocvar_hud_skin) { if (hud_skin_path) strunzone(hud_skin_path); hud_skin_path = strzone(strcat("gfx/hud/", autocvar_hud_skin)); + if (hud_skin_prev) + strunzone(hud_skin_prev); + hud_skin_prev = strzone(autocvar_hud_skin); } // HUD configure visible grid @@ -5076,8 +4892,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; @@ -5137,9 +4953,14 @@ void HUD_Main (void) HUD_Panel_UpdatePosSizeForId(highlightedPanel); HUD_Panel_HlBorder(panel_bg_border + 1.5 * hlBorderSize, '0 0.5 1', 0.25 * (1 - autocvar__menu_alpha)); } - if (!hud_configure_prev) + if(!hud_configure_prev || hud_configure_prev == -1) + { + if(autocvar_hud_cursormode) { setcursormode(1); } hudShiftState = 0; + } } + else if (hud_configure_prev && autocvar_hud_cursormode) + setcursormode(0); hud_configure_prev = autocvar__hud_configure;