X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qc;h=bf72c2f467bd9b08551278e36b8eb799a47e7d4b;hb=7cbefc310807608f9a6761836d9ff45819da2554;hp=a56307e75801190e548d90a05458485bff02096c;hpb=b5241e58e122f0bd7945b9a33a44ab14d8618bb2;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index a56307e75..bf72c2f46 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -243,9 +243,9 @@ float GetPlayerColorForce(float i) float GetPlayerColor(float i) { if not(playerslots[i].gotscores) // unconnected - return FL_SPECTATOR; + return NUM_SPECTATOR; else if(stof(getplayerkeyvalue(i, "frags")) == FRAGS_SPECTATOR) - return FL_SPECTATOR; + return NUM_SPECTATOR; else return GetPlayerColorForce(i); } @@ -452,7 +452,7 @@ void HUD_Weapons(void) float i, f, a; float screen_ar, center_x = 0, center_y; float weapon_count, weapon_id; - float row, column, rows, columns; + float row, column, rows = 0, columns; float aspect = autocvar_hud_panel_weapons_aspect; float panel_weapon_accuracy; @@ -466,10 +466,10 @@ void HUD_Weapons(void) 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; + float when = max(1, autocvar_hud_panel_weapons_complainbubble_time); + float fadetime = max(0, autocvar_hud_panel_weapons_complainbubble_fadetime); - vector weapon_pos, weapon_size; + vector weapon_pos, weapon_size = '0 0 0'; local noref vector old_panel_size; // fteqcc sucks vector color; @@ -526,6 +526,9 @@ void HUD_Weapons(void) weaponorder_cmp_str = string_null; } + if(!autocvar_hud_panel_weapons_complainbubble || autocvar__hud_configure || time - complain_weapon_time >= when + fadetime) + complain_weapon = 0; + // determine which weapons are going to be shown if (autocvar_hud_panel_weapons_onlyowned) { @@ -546,27 +549,44 @@ void HUD_Weapons(void) ++weapon_count; // add it anyway if weaponcomplain is shown - if((!autocvar__hud_configure) - && (autocvar_hud_panel_weapons_complainbubble - && time - complain_weapon_time < when + fadetime)) - ++weapon_count; + if(complain_weapon) + ++weapon_count; // might as well commit suicide now, no reason to live ;) - if (weapon_count == 0) { return; } - - // reduce size of the panel - if (panel_size_y > panel_size_x) + if (weapon_count == 0) { - old_panel_size_y = panel_size_y; - panel_size_y *= weapon_count / WEP_COUNT; - panel_pos_y += (old_panel_size_y - panel_size_y) / 2; + draw_endBoldFont(); + return; } - else + + old_panel_size = panel_size; + if(panel_bg_padding) + old_panel_size -= '2 2 0' * panel_bg_padding; + + // first find values for the standard table (with all the weapons) + rows = old_panel_size_y/old_panel_size_x; + rows = bound(1, floor((sqrt(4 * aspect * rows * WEP_COUNT + rows * rows) + rows + 0.5) / 2), WEP_COUNT); + columns = ceil(WEP_COUNT/rows); + weapon_size_x = old_panel_size_x / columns; + weapon_size_y = old_panel_size_y / rows; + + // change table values to include only the owned weapons + // weapon_size won't be changed + if(weapon_count <= rows) { - old_panel_size_x = panel_size_x; - panel_size_x *= weapon_count / WEP_COUNT; - panel_pos_x += (old_panel_size_x - panel_size_x) / 2; + rows = weapon_count; + columns = 1; } + else + columns = ceil(weapon_count / rows); + + // reduce size of the panel + panel_size_x = columns * weapon_size_x; + panel_size_y = rows * weapon_size_y; + panel_pos_x += (old_panel_size_x - panel_size_x) / 2; + panel_pos_y += (old_panel_size_y - panel_size_y) / 2; + if(panel_bg_padding) + panel_size += '2 2 0' * panel_bg_padding; } else weapon_count = WEP_COUNT; @@ -662,7 +682,10 @@ void HUD_Weapons(void) HUD_Panel_DrawBg(1); if(center_x == -1) + { + draw_endBoldFont(); return; + } if(panel_bg_padding) { @@ -671,10 +694,14 @@ void HUD_Weapons(void) } // after the sizing and animations are done, update the other values - rows = panel_size_y/panel_size_x; - rows = bound(1, floor((sqrt(4 * aspect * rows * weapon_count + rows * rows) + rows + 0.5) / 2), weapon_count); - columns = ceil(weapon_count/rows); - weapon_size = eX * panel_size_x*(1/columns) + eY * panel_size_y*(1/rows); + + if(!rows) // if rows is > 0 onlyowned code has already updated these vars + { + rows = panel_size_y/panel_size_x; + rows = bound(1, floor((sqrt(4 * aspect * rows * weapon_count + rows * rows) + rows + 0.5) / 2), weapon_count); + columns = ceil(weapon_count/rows); + weapon_size = eX * panel_size_x*(1/columns) + eY * panel_size_y*(1/rows); + } // calculate position/size for visual bar displaying ammount of ammo status if (autocvar_hud_panel_weapons_ammo) @@ -706,15 +733,12 @@ void HUD_Weapons(void) weapon_id = self.impulse; // skip if this weapon doesn't exist - if (!self || self.impulse < 0) { continue; } + if(!self || weapon_id < 0) { continue; } // skip this weapon if we don't own it (and onlyowned is enabled)-- or if weapons_complainbubble is showing for this weapon - if (autocvar_hud_panel_weapons_onlyowned - && !(WEPSET_CONTAINS_AW(weapons_stat, self.weapon) - || (self.weapon == complain_weapon - && time - complain_weapon_time < when + fadetime - && autocvar_hud_panel_weapons_complainbubble))) - continue; + if(autocvar_hud_panel_weapons_onlyowned) + if not(WEPSET_CONTAINS_AW(weapons_stat, self.weapon) || (self.weapon == complain_weapon)) + continue; // figure out the drawing position of weapon weapon_pos = (panel_pos @@ -796,14 +820,13 @@ void HUD_Weapons(void) } // draw the complain message - if(time - complain_weapon_time < when + fadetime && self.weapon == complain_weapon && autocvar_hud_panel_weapons_complainbubble) + if(self.weapon == complain_weapon) { if(fadetime) a = ((complain_weapon_time + when > time) ? 1 : bound(0, (complain_weapon_time + when + fadetime - time) / fadetime, 1)); else a = ((complain_weapon_time + when > time) ? 1 : 0); - string s; if(complain_weapon_type == 0) { s = _("Out of ammo"); @@ -1605,20 +1628,6 @@ void HUD_HealthArmor(void) // Notification area (#4) // -string Weapon_SuicideMessage(float deathtype) -{ - w_deathtype = deathtype; - get_weaponinfo(DEATH_WEAPONOF(deathtype)).weapon_func(WR_SUICIDEMESSAGE); - return w_deathtypestring; -} - -string Weapon_KillMessage(float deathtype) -{ - w_deathtype = deathtype; - get_weaponinfo(DEATH_WEAPONOF(deathtype)).weapon_func(WR_KILLMESSAGE); - return w_deathtypestring; -} - void HUD_Notify_Push(string icon, string attacker, string victim) { if(icon != "") @@ -1861,6 +1870,8 @@ void HUD_Radar(void) HUD_Panel_UpdateCvars(radar); HUD_Panel_ApplyFadeAlpha(); + + float f = 0; if (hud_panel_radar_maximized && !autocvar__hud_configure) { @@ -1872,6 +1883,62 @@ void HUD_Radar(void) panel_bg = strcat(hud_skin_path, "/border_default"); // always use the default border when maximized if(precache_pic(panel_bg) == "") { panel_bg = "gfx/hud/default/border_default"; } // fallback + + switch(hud_panel_radar_maximized_zoommode) + { + default: + case 0: + f = current_zoomfraction; + break; + case 1: + f = 1 - current_zoomfraction; + break; + case 2: + f = 0; + break; + case 3: + f = 1; + break; + } + + switch(hud_panel_radar_maximized_rotation) + { + case 0: + teamradar_angle = view_angles_y - 90; + break; + default: + teamradar_angle = 90 * hud_panel_radar_maximized_rotation; + break; + } + } + if (!hud_panel_radar_maximized && !autocvar__hud_configure) + { + switch(hud_panel_radar_zoommode) + { + default: + case 0: + f = current_zoomfraction; + break; + case 1: + f = 1 - current_zoomfraction; + break; + case 2: + f = 0; + break; + case 3: + f = 1; + break; + } + + switch(hud_panel_radar_rotation) + { + case 0: + teamradar_angle = view_angles_y - 90; + break; + default: + teamradar_angle = 90 * hud_panel_radar_rotation; + break; + } } vector pos, mySize; @@ -1888,7 +1955,6 @@ void HUD_Radar(void) float color2; entity tm; float scale2d, normalsize, bigsize; - float f; teamradar_origin2d = pos + 0.5 * mySize; teamradar_size2d = mySize; @@ -1898,40 +1964,13 @@ void HUD_Radar(void) teamradar_loadcvars(); - switch(hud_panel_radar_zoommode) - { - default: - case 0: - f = current_zoomfraction; - break; - case 1: - f = 1 - current_zoomfraction; - break; - case 2: - f = 0; - break; - case 3: - f = 1; - break; - } - - switch(hud_panel_radar_rotation) - { - case 0: - teamradar_angle = view_angles_y - 90; - break; - default: - teamradar_angle = 90 * hud_panel_radar_rotation; - break; - } - scale2d = vlen_maxnorm2d(mi_picmax - mi_picmin); teamradar_size2d = mySize; teamradar_extraclip_mins = teamradar_extraclip_maxs = '0 0 0'; // we always center // pixels per world qu to match the teamradar_size2d_x range in the longest dimension - if(hud_panel_radar_rotation == 0) + if((hud_panel_radar_rotation == 0 && !hud_panel_radar_maximized) || (hud_panel_radar_maximized_rotation == 0 && hud_panel_radar_maximized)) { // max-min distance must fit the radar in any rotation bigsize = vlen_minnorm2d(teamradar_size2d) * scale2d / (1.05 * vlen2d(mi_scale)); @@ -1981,13 +2020,13 @@ void HUD_Radar(void) for(tm = world; (tm = find(tm, classname, "entcs_receiver")); ) { color2 = GetPlayerColor(tm.sv_entnum); - //if(color == FL_SPECTATOR || color == color2) + //if(color == NUM_SPECTATOR || color == color2) draw_teamradar_player(tm.origin, tm.angles, Team_ColorRGB(color2)); } draw_teamradar_player(view_origin, view_angles, '1 1 1'); drawresetcliparea(); -}; +} // Score (#7) // @@ -2062,7 +2101,7 @@ void HUD_Score_Rankings(vector pos, vector mySize, entity me, float team_count) // show team scores in the first line float score_size = mySize_x / team_count; for(tm = teams.sort_next; tm; tm = tm.sort_next) { - if(tm.team == FL_SPECTATOR) + if(tm.team == NUM_SPECTATOR) continue; if (tm.team == myteam) drawfill(pos + eX * score_size * i, eX * score_size + eY * fontsize_y, '1 1 1', highlight_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); @@ -2078,14 +2117,14 @@ void HUD_Score_Rankings(vector pos, vector mySize, entity me, float team_count) do for (pl = players.sort_next; pl && i mySize_y) { - if (myteam == FL_TEAM_1) { // always draw own flag on left + if (myteam == NUM_TEAM_1) { // always draw own flag on left redflag_pos = pos; blueflag_pos = pos + eX * 0.5 * mySize_x; } else { @@ -2771,7 +2810,7 @@ void HUD_Mod_CTF(vector pos, vector mySize) } flag_size = eX * 0.5 * mySize_x + eY * mySize_y; } else { - if (myteam == FL_TEAM_1) { // always draw own flag on left + if (myteam == NUM_TEAM_1) { // always draw own flag on left redflag_pos = pos; blueflag_pos = pos + eY * 0.5 * mySize_y; } else { @@ -2885,16 +2924,16 @@ void HUD_Mod_KH(vector pos, vector mySize) { switch(keyteam) { - case FL_TEAM_1: + case NUM_TEAM_1: drawpic_aspect_skin(pa, "kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% theAlpha key break; - case FL_TEAM_2: + case NUM_TEAM_2: drawpic_aspect_skin(pa, "kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% theAlpha key break; - case FL_TEAM_3: + case NUM_TEAM_3: drawpic_aspect_skin(pa, "kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% theAlpha key break; - case FL_TEAM_4: + case NUM_TEAM_4: drawpic_aspect_skin(pa, "kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% theAlpha key break; default: @@ -3241,7 +3280,7 @@ void HUD_Mod_Dom(vector myPos, vector mySize) entity tm; float teams_count = 0; for(tm = teams.sort_next; tm; tm = tm.sort_next) - if(tm.team != FL_SPECTATOR) + if(tm.team != NUM_SPECTATOR) ++teams_count; float layout = autocvar_hud_panel_modicons_dom_layout; @@ -3700,7 +3739,7 @@ void HUD_InfoMessages(void) { for(; tm.sort_next; tm = tm.sort_next) { - if(!tm.team_size || tm.team == FL_SPECTATOR) + if(!tm.team_size || tm.team == NUM_SPECTATOR) continue; if(!ts_min) ts_min = tm.team_size; else ts_min = min(ts_min, tm.team_size); @@ -3712,7 +3751,7 @@ void HUD_InfoMessages(void) s = strcat(blinkcolor, _("Teamnumbers are unbalanced!")); tm = GetTeam(myteam, false); if (tm) - if (tm.team != FL_SPECTATOR) + if (tm.team != NUM_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) @@ -4024,6 +4063,7 @@ float centerprint_showing; void centerprint_generic(float new_id, string strMessage, float duration, float countdown_num) { + //print(sprintf("centerprint_generic(%d, '%s^7', %d, %d);\n", new_id, strMessage, duration, countdown_num)); float i, j; if(strMessage == "" && new_id == 0) @@ -4083,7 +4123,10 @@ void centerprint_generic(float new_id, string strMessage, float duration, float centerprint_messages[j] = strzone(strMessage); centerprint_msgID[j] = new_id; if (duration < 0) + { centerprint_time[j] = -1; + centerprint_expire_time[j] = time; + } else { if(duration == 0) @@ -4184,7 +4227,7 @@ void HUD_CenterPrint (void) fontsize = '1 1 0' * height; entries = bound(1, floor(panel_size_y/height), CENTERPRINT_MAX_ENTRIES); - float i, j, k, n; + float i, j, k, n, g; float a, sz, align, current_msg_pos_y = 0, msg_size; vector pos; string ts; @@ -4195,7 +4238,7 @@ void HUD_CenterPrint (void) if (autocvar_hud_panel_centerprint_flip) pos_y += panel_size_y; align = bound(0, autocvar_hud_panel_centerprint_align, 1); - for (i=0, j=cpm_index; i time) + if(centerprint_time[j] < 0) + a = bound(0, (time - centerprint_expire_time[j]) / max(0.0001, autocvar_hud_panel_centerprint_fade_in), 1); + else if(centerprint_expire_time[j] - autocvar_hud_panel_centerprint_fade_out > time) 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) + 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; @@ -4226,8 +4272,8 @@ void HUD_CenterPrint (void) // also fade it based on positioning if(autocvar_hud_panel_centerprint_fade_subsequent) { - a = a * bound(autocvar_hud_panel_centerprint_fade_subsequent_passone_minalpha, (1 - (i / max(1, autocvar_hud_panel_centerprint_fade_subsequent_passone))), 1); // pass one: all messages after the first have half theAlpha - a = a * bound(autocvar_hud_panel_centerprint_fade_subsequent_passtwo_minalpha, (1 - (i / max(1, autocvar_hud_panel_centerprint_fade_subsequent_passtwo))), 1); // pass two: after that, gradually lower theAlpha even more for each message + a = a * bound(autocvar_hud_panel_centerprint_fade_subsequent_passone_minalpha, (1 - (g / max(1, autocvar_hud_panel_centerprint_fade_subsequent_passone))), 1); // pass one: all messages after the first have half theAlpha + a = a * bound(autocvar_hud_panel_centerprint_fade_subsequent_passtwo_minalpha, (1 - (g / max(1, autocvar_hud_panel_centerprint_fade_subsequent_passtwo))), 1); // pass two: after that, gradually lower theAlpha even more for each message } // finally set the size based on the new theAlpha from subsequent fading @@ -4275,6 +4321,9 @@ void HUD_CenterPrint (void) pos_y += fontsize_y * CENTERPRINT_SPACING/2; } } + + ++g; // move next position number up + msg_size = pos_y - msg_size; if (autocvar_hud_panel_centerprint_flip) { @@ -4440,8 +4489,7 @@ void HUD_Main (void) vector color; float hud_dock_color_team = autocvar_hud_dock_color_team; if((teamplay) && hud_dock_color_team) { - f = stof(getplayerkeyvalue(current_player - 1, "colors")); - color = colormapPaletteColor(mod(f, 16), 1) * hud_dock_color_team; + color = colormapPaletteColor(myteam, 1) * hud_dock_color_team; } else if(autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && hud_dock_color_team) { color = '1 0 0' * hud_dock_color_team;