X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qc;h=bf72c2f467bd9b08551278e36b8eb799a47e7d4b;hb=cb6fe34871089613c9f47e173b38fc679cd8e45b;hp=f262b0e266d4b0f1a6a37d357c3081f3c70bbe14;hpb=33e2709cb7e724bcddd442aad479d15a39c16156;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index f262b0e26..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); } @@ -526,8 +526,7 @@ void HUD_Weapons(void) weaponorder_cmp_str = string_null; } - if(autocvar_hud_panel_weapons_complainbubble) - if(autocvar__hud_configure || time - complain_weapon_time >= when + fadetime) + 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 @@ -734,7 +733,7 @@ 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) @@ -1629,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 != "") @@ -2035,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) // @@ -2116,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); @@ -2132,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 { @@ -2825,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 { @@ -2939,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: @@ -3295,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; @@ -3754,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); @@ -3766,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) @@ -4078,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) @@ -4137,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) @@ -4238,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; @@ -4249,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; @@ -4280,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 @@ -4329,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) { @@ -4494,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;