X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qc;h=3299648da6f95b78fac741078bad690097ba7825;hb=9a2efec7718c9dd4805a8982f475f86f05509979;hp=9eb99ba59c08f3ef3d87a10e7ddd0121209e4efb;hpb=ec7ff827741a81d266e004e720644f57d480a4f3;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 9eb99ba59..3299648da 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -142,183 +142,6 @@ float stringwidth_nocolors(string s, vector theSize)
 	return stringwidth(s, FALSE, theSize);
 }
 
-#define CENTERPRINT_MAX_LINES 30
-string centerprint_messages[CENTERPRINT_MAX_LINES];
-float centerprint_width[CENTERPRINT_MAX_LINES];
-float centerprint_time;
-float centerprint_expire;
-float centerprint_num;
-float centerprint_offset_hint;
-vector centerprint_fontsize;
-
-void centerprint(string strMessage)
-{
-	float i, j, n, hcount;
-	string s;
-
-	centerprint_fontsize = HUD_GetFontsize("scr_centersize");
-
-	centerprint_expire = min(centerprint_expire, time); // if any of the returns happens, this message will fade out
-
-	if(autocvar_scr_centertime <= 0)
-		return;
-
-	if(strMessage == "")
-		return;
-
-	// strip trailing newlines
-	j = strlen(strMessage) - 1;
-	while(substring(strMessage, j, 1) == "\n" && j >= 0)
-		j = j - 1;
-	strMessage = substring(strMessage, 0, j + 1);
-
-	if(strMessage == "")
-		return;
-
-	// strip leading newlines and remember them, they are a hint that the message should be lower on the screen
-	j = 0;
-	while(substring(strMessage, j, 1) == "\n" && j < strlen(strMessage))
-		j = j + 1;
-	strMessage = substring(strMessage, j, strlen(strMessage) - j);
-	centerprint_offset_hint = j;
-
-	if(strMessage == "")
-		return;
-
-	// if we get here, we have a message. Initialize its height.
-	centerprint_num = 0;
-
-	n = tokenizebyseparator(strMessage, "\n");
-	i = hcount = 0;
-	for(j = 0; j < n; ++j)
-	{
-		getWrappedLine_remaining = argv(j);
-		while(getWrappedLine_remaining)
-		{
-			s = getWrappedLine(vid_conwidth * 0.75, centerprint_fontsize, stringwidth_colors);
-			if(centerprint_messages[i] != s) // don't fade the same message in, looks stupid
-				centerprint_time = time;
-			if(centerprint_messages[i])
-				strunzone(centerprint_messages[i]);
-			centerprint_messages[i] = strzone(s);
-			centerprint_width[i] = stringwidth(s, TRUE, centerprint_fontsize);
-			++i;
-
-			// half height for empty lines looks better
-			if(s == "")
-				hcount += 0.5;
-			else
-				hcount += 1;
-
-			if(i >= CENTERPRINT_MAX_LINES)
-				break;
-		}
-	}
-
-	float h, havail;
-	h = centerprint_fontsize_y*hcount;
-
-	havail = vid_conheight;
-	if(autocvar_con_chatpos < 0)
-		havail -= (-autocvar_con_chatpos + autocvar_con_chat) * autocvar_con_chatsize; // avoid overlapping chat
-	if(havail > vid_conheight - 70)
-		havail = vid_conheight - 70; // avoid overlapping HUD
-
-#if 0
-	float forbiddenmin, forbiddenmax, allowedmin, allowedmax, preferred;
-
-	// here, the centerprint would cover the crosshair. REALLY BAD.
-	forbiddenmin = vid_conheight * 0.5 - h - 16;
-	forbiddenmax = vid_conheight * 0.5 + 16;
-
-	allowedmin = scoreboard_bottom;
-	allowedmax = havail - h;
-	preferred = (havail - h)/2;
-
-
-	// possible orderings (total: 4! / 4 = 6)
-	//  allowedmin allowedmax forbiddenmin forbiddenmax
-	//  forbiddenmin forbiddenmax allowedmin allowedmax
-	if(allowedmax < forbiddenmin || allowedmin > forbiddenmax)
-	{
-		// forbidden doesn't matter in this case
-		centerprint_start_y = bound(allowedmin, preferred, allowedmax);
-	}
-	//  allowedmin forbiddenmin allowedmax forbiddenmax
-	else if(allowedmin < forbiddenmin && allowedmax < forbiddenmax)
-	{
-		centerprint_start_y = bound(allowedmin, preferred, forbiddenmin);
-	}
-	//  allowedmin forbiddenmin forbiddenmax allowedmax
-	else if(allowedmin < forbiddenmin)
-	{
-		// make sure the forbidden zone is not covered
-		if(preferred > (forbiddenmin + forbiddenmax) * 0.5)
-			centerprint_start_y = bound(allowedmin, preferred, forbiddenmin);
-		else
-			centerprint_start_y = bound(forbiddenmax, preferred, allowedmin);
-	}
-	//  forbiddenmin allowedmin allowedmax forbiddenmax
-	else if(allowedmax < forbiddenmax)
-	{
-		// it's better to leave the allowed zone (overlap with scoreboard) than
-		// to cover the forbidden zone (crosshair)
-		if(preferred > (forbiddenmin + forbiddenmax) * 0.5)
-			centerprint_start_y = forbiddenmax;
-		else
-			centerprint_start_y = forbiddenmin;
-	}
-	//  forbiddenmin allowedmin forbiddenmax allowedmax
-	else
-	{
-		centerprint_start_y = bound(forbiddenmax, preferred, allowedmax);
-	}
-#else
-#endif
-
-	centerprint_num = i;
-
-	centerprint_expire = time + autocvar_scr_centertime;
-}
-
-void HUD_DrawCenterPrint (void)
-{
-	float i;
-	vector pos;
-	string ts;
-	float a, sz;
-
-	if(time - centerprint_time < 0.25)
-		a = (time - centerprint_time) / 0.25;
-	else
-		a = bound(0, 1 - 4 * (time - centerprint_expire), 1);
-
-	if(a <= 0)
-		return;
-
-	sz = 0.8 + (a / 5);
-
-	if(centerprint_num * autocvar_scr_centersize > 24 && scoreboard_active) // 24 = height of Scoreboard text
-		centerprint_start_y = scoreboard_bottom + centerprint_fontsize_y;
-
-	pos = centerprint_start;
-	for (i=0; i<centerprint_num; i = i + 1)
-	{
-		ts = centerprint_messages[i];
-		drawfontscale = sz * '1 1 0';
-		pos_x = (vid_conwidth - stringwidth(ts, TRUE, centerprint_fontsize)) * 0.5;
-		if (ts != "")
-		{
-			drawcolorcodedstring(pos + '0 1 0' * (1 - sz) * 0.5 *centerprint_fontsize_y, ts, centerprint_fontsize, a, DRAWFLAG_NORMAL);
-			pos_y = pos_y + centerprint_fontsize_y;
-		}
-		else
-			// half height for empty lines looks better
-			pos_y = pos_y + sz * centerprint_fontsize_y * 0.5;
-		drawfontscale = '1 1 0';
-	}
-}
-
 void drawstringright(vector position, string text, vector scale, vector rgb, float alpha, float flag)
 {
 	position_x -= 2 / 3 * strlen(text) * scale_x;
@@ -600,7 +423,7 @@ float GetAmmoTypeForWep(float i)
 		case WEP_HLAC: return 3;
 		case WEP_MINSTANEX: return 3;
 		case WEP_NEX: return 3;
-		case WEP_SNIPERRIFLE: return 1;
+		case WEP_RIFLE: return 1;
 		case WEP_HAGAR: return 2;
 		case WEP_ROCKET_LAUNCHER: return 2;
 		case WEP_SEEKER: return 2;
@@ -1300,10 +1123,19 @@ void HUD_Powerups(void)
 
 // Health/armor (#3)
 //
-float health_time, prev_health;
-float armor_time, prev_armor;
-var float saved_health = -2;
-var float saved_armor = -2;
+
+// prev_* vars contain the health/armor at the previous FRAME
+// set to -1 when player is dead or was not playing
+float prev_health, prev_armor;
+float health_damagetime, armor_damagetime;
+float health_beforedamage, armor_beforedamage;
+// old_p_* vars keep track of previous values when smoothing value changes of the progressbar
+float old_p_health, old_p_armor;
+float old_p_healthtime, old_p_armortime;
+// prev_p_* vars contain the health/armor progressbar value at the previous FRAME
+// set to -1 to forcedly stop effects when we switch spectated player (e.g. from playerX: 70h to playerY: 50h)
+float prev_p_health, prev_p_armor;
+
 void HUD_HealthArmor(void)
 {
 	float armor, health, fuel;
@@ -1315,36 +1147,36 @@ void HUD_HealthArmor(void)
 		health = getstati(STAT_HEALTH);
 		if(health <= 0)
 		{
-			health_time = -1;
+			prev_health = -1;
 			return;
 		}
-		if (autocvar_hud_panel_healtharmor_progressbar_gfx)
-		{
-			if ( (prev_spectatee_status == -1 && spectatee_status > 0) //before observing, now spectating
-			  || (prev_spectatee_status > 0 && spectatee_status > 0 && prev_spectatee_status != spectatee_status) //changed spectated player
-			)
-			{
-				//no effect
-				saved_health = 0;
-				saved_armor = 0;
-				health_time = 0;
-				armor_time = 0;
-			}
-			else if(prev_spectatee_status == -1 || (prev_spectatee_status > 0 && !spectatee_status)) //before spectating/observing, now playing
-				health_time = -1;
+		armor = getstati(STAT_ARMOR);
 
-			if (health_time == -1)
-			{
-				//start the load effect
-				saved_health = -2;
-				saved_armor = -2;
-				health_time = time;
-				armor_time = time;
-				prev_health = 0;
-				prev_armor = 0;
-			}
+		// code to check for spectatee_status changes is in Ent_ClientData()
+		// prev_p_health and prev_health can be set to -1 there
+
+		if (prev_p_health == -1)
+		{
+			// no effect
+			health_beforedamage = 0;
+			armor_beforedamage = 0;
+			health_damagetime = 0;
+			armor_damagetime = 0;
+			prev_health = health;
+			prev_armor = armor;
+			old_p_health = health;
+			old_p_armor = armor;
+			prev_p_health = health;
+			prev_p_armor = armor;
+		}
+		else if (prev_health == -1)
+		{
+			//start the load effect
+			health_damagetime = 0;
+			armor_damagetime = 0;
+			prev_health = 0;
+			prev_armor = 0;
 		}
-		armor = getstati(STAT_ARMOR);
 		fuel = getstati(STAT_FUEL);
 	}
 	else
@@ -1467,34 +1299,39 @@ void HUD_HealthArmor(void)
 				pain_health_alpha = 1;
 				if (autocvar_hud_panel_healtharmor_progressbar_gfx)
 				{
-					if (saved_health == -1)
+					if (autocvar_hud_panel_healtharmor_progressbar_gfx_smooth > 0)
 					{
-						if (prev_health == 0 || prev_health - health >= 3)
+						if (fabs(prev_health - health) >= autocvar_hud_panel_healtharmor_progressbar_gfx_smooth)
+						{
+							if (time - old_p_healthtime < 1)
+								old_p_health = prev_p_health;
+							else
+								old_p_health = prev_health;
+							old_p_healthtime = time;
+						}
+						if (time - old_p_healthtime < 1)
 						{
-							health_time = time;
-							saved_health = prev_health;
+							p_health += (old_p_health - health) * (1 - (time - old_p_healthtime));
+							prev_p_health = p_health;
 						}
 					}
-					if (saved_health != -1)
+					if (autocvar_hud_panel_healtharmor_progressbar_gfx_damage > 0)
 					{
-						float d = time - health_time;
-						if (d < 1)
+						if (prev_health - health >= autocvar_hud_panel_healtharmor_progressbar_gfx_damage)
 						{
-							if (saved_health == -2)
-								p_health *= sqrt(d);
-							else
-							{
-								HUD_Panel_DrawProgressBar(pos + health_offset, mySize, autocvar_hud_panel_healtharmor_progressbar_health, saved_health/maxhealth, is_vertical, health_baralign, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * (1 - d * d), DRAWFLAG_NORMAL);
-								if (prev_health - health >= 1) //refresh the effect if repeatedly damaged
-									health_time = time;
-							}
+							if (time - health_damagetime >= 1)
+								health_beforedamage = prev_health;
+							health_damagetime = time;
+						}
+						if (time - health_damagetime < 1)
+						{
+							float health_damagealpha = 1 - (time - health_damagetime)*(time - health_damagetime);
+							HUD_Panel_DrawProgressBar(pos + health_offset, mySize, autocvar_hud_panel_healtharmor_progressbar_health, health_beforedamage/maxhealth, is_vertical, health_baralign, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * health_damagealpha, DRAWFLAG_NORMAL);
 						}
-						else
-							saved_health = -1; //damage effect ended
 					}
 					prev_health = health;
 
-					if (health <= 40 && saved_health != -2)
+					if (health <= autocvar_hud_panel_healtharmor_progressbar_gfx_lowhealth)
 					{
 						float BLINK_FACTOR = 0.15;
 						float BLINK_BASE = 0.85;
@@ -1517,30 +1354,35 @@ void HUD_HealthArmor(void)
 				p_armor = armor;
 				if (autocvar_hud_panel_healtharmor_progressbar_gfx)
 				{
-					if (saved_armor == -1)
+					if (autocvar_hud_panel_healtharmor_progressbar_gfx_smooth > 0)
 					{
-						if (prev_armor == 0 || prev_armor - armor >= 3)
+						if (fabs(prev_armor - armor) >= autocvar_hud_panel_healtharmor_progressbar_gfx_smooth)
 						{
-							armor_time = time;
-							saved_armor = prev_armor;
+							if (time - old_p_armortime < 1)
+								old_p_armor = prev_p_armor;
+							else
+								old_p_armor = prev_armor;
+							old_p_armortime = time;
+						}
+						if (time - old_p_armortime < 1)
+						{
+							p_armor += (old_p_armor - armor) * (1 - (time - old_p_armortime));
+							prev_p_armor = p_armor;
 						}
 					}
-					if (saved_armor != -1)
+					if (autocvar_hud_panel_healtharmor_progressbar_gfx_damage > 0)
 					{
-						float d = time - armor_time;
-						if (d < 1)
+						if (prev_armor - armor >= autocvar_hud_panel_healtharmor_progressbar_gfx_damage)
 						{
-							if (saved_armor == -2)
-								p_armor *= sqrt(d);
-							else
-							{
-								HUD_Panel_DrawProgressBar(pos + armor_offset, mySize, autocvar_hud_panel_healtharmor_progressbar_armor, saved_armor/maxarmor, is_vertical, armor_baralign, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * (1 - d * d), DRAWFLAG_NORMAL);
-								if (prev_armor - armor >= 1) //refresh the effect if repeatedly damaged
-									armor_time = time;
-							}
+							if (time - armor_damagetime >= 1)
+								armor_beforedamage = prev_armor;
+							armor_damagetime = time;
+						}
+						if (time - armor_damagetime < 1)
+						{
+							float armor_damagealpha = 1 - (time - armor_damagetime)*(time - armor_damagetime);
+							HUD_Panel_DrawProgressBar(pos + armor_offset, mySize, autocvar_hud_panel_healtharmor_progressbar_armor, armor_beforedamage/maxarmor, is_vertical, armor_baralign, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * armor_damagealpha, DRAWFLAG_NORMAL);
 						}
-						else
-							saved_armor = -1; //damage effect ended
 					}
 					prev_armor = armor;
 				}
@@ -1661,7 +1503,7 @@ 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)) {
-			if((w == WEP_SNIPERRIFLE || w == WEP_MINSTANEX) && type & HITTYPE_HEADSHOT) // all headshot weapons go here
+			if((w == WEP_RIFLE || 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);
@@ -1831,7 +1673,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s
 				print (sprintf(_("%s^7 is a ^1BERSERKER!\n"), s1));
 		} else if(type == KILL_SPREE_25) {
 			if(gentle)
-				print (sprintf(_("%s^7 made ^1TWENTY FIFE SCORES IN A ROW!\n"), s1));
+				print (sprintf(_("%s^7 made ^1TWENTY FIVE SCORES IN A ROW!\n"), s1));
 			else
 				print (sprintf(_("%s^7 inflicts ^1CARNAGE!\n"), s1));
 		} else if(type == KILL_SPREE_30) {
@@ -1973,92 +1815,90 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s
 	}
 }
 
-#define DAMAGE_CENTERPRINT_SPACER NEWLINES
-
 void HUD_Centerprint(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(strcat(DAMAGE_CENTERPRINT_SPACER, sprintf(_("You are now on: %s"), s1)));
+			centerprint(strcat(sprintf(_("You are now on: %s"), s1)));
 		} else if (type == DEATH_AUTOTEAMCHANGE) {
-			centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, sprintf(_("You have been moved into a different team to improve team balance\nYou are now on: %s"), s1)));
+			centerprint(strcat(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(strcat(DAMAGE_CENTERPRINT_SPACER, _("^1Reconsider your tactics, camper!")));
+				centerprint(strcat(_("^1Reconsider your tactics, camper!")));
 			else
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, _("^1Die camper!")));
+				centerprint(strcat(_("^1Die camper!")));
 		} else if (type == DEATH_NOAMMO) {
 			if(gentle)
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, _("^1You are reinserted into the game for running out of ammo...")));
+				centerprint(strcat(_("^1You are reinserted into the game for running out of ammo...")));
 			else
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, _("^1You were killed for running out of ammo...")));
+				centerprint(strcat(_("^1You were killed for running out of ammo...")));
 		} else if (type == DEATH_ROT) {
 			if(gentle)
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, _("^1You need to preserve your health")));
+				centerprint(strcat(_("^1You need to preserve your health")));
 			else
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, _("^1You grew too old without taking your medicine")));
+				centerprint(strcat(_("^1You grew too old without taking your medicine")));
 		} else if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) {
 			if(gentle)
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, _("^1Don't go against team mates!")));
+				centerprint(strcat(_("^1Don't go against team mates!")));
 			else
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, _("^1Don't shoot your team mates!")));
+				centerprint(strcat(_("^1Don't shoot your team mates!")));
 		} else if (type == DEATH_QUIET) {
 			// do nothing
 		} else { // generic message
 			if(gentle)
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, _("^1You need to be more careful!")));
+				centerprint(strcat(_("^1You need to be more careful!")));
 			else
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, _("^1You killed your own dumb self!")));
+				centerprint(strcat(_("^1You killed your own dumb self!")));
 		}
 	} else if(msg == MSG_KILL) {
 		if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) {
 			if(gentle) {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, sprintf(_("^1Moron! You went against %s, a team mate!"), s1)));
+				centerprint(strcat(sprintf(_("^1Moron! You went against %s, a team mate!"), s1)));
 			} else {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, sprintf(_("^1Moron! You fragged %s, a team mate!"), s1)));
+				centerprint(strcat(sprintf(_("^1Moron! You fragged %s, a team mate!"), s1)));
 			}
 		} else if (type == KILL_FIRST_BLOOD) {
 			if(gentle) {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, _("^1First score")));
+				centerprint(strcat(_("^1First score")));
 			} else {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, _("^1First blood")));
+				centerprint(strcat(_("^1First blood")));
 			}
 		} else if (type == KILL_FIRST_VICTIM) {
 			if(gentle) {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, _("^1First casualty")));
+				centerprint(strcat(_("^1First casualty")));
 			} else {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, _("^1First victim")));
+				centerprint(strcat(_("^1First victim")));
 			}
 		} else if (type == KILL_TYPEFRAG) { // s2 contains "advanced kill messages" such as ping, handicap...
 			if(gentle) {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, sprintf(_("^1You scored against ^7%s^1 who was typing!"), s1), s2));
+				centerprint(strcat(sprintf(_("^1You scored against ^7%s^1 who was typing!"), s1), s2));
 			} else {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, sprintf(_("^1You typefragged ^7%s"), s1), s2));
+				centerprint(strcat(sprintf(_("^1You typefragged ^7%s"), s1), s2));
 			}
 		} else if (type == KILL_TYPEFRAGGED) {
 			if(gentle) {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, sprintf(_("^1You were scored against by ^7%s^1 while you were typing!"), s1), s2));
+				centerprint(strcat(sprintf(_("^1You were scored against by ^7%s^1 while you were typing!"), s1), s2));
 			} else {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, sprintf(_("^1You were typefragged by ^7%s"), s1), s2));
+				centerprint(strcat(sprintf(_("^1You were typefragged by ^7%s"), s1), s2));
 			}
 		} else if (type == KILL_FRAG) {
 			if(gentle) {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, sprintf(_("^4You scored against ^7%s"), s1), s2));
+				centerprint(strcat(sprintf(_("^4You scored against ^7%s"), s1), s2));
 			} else {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, sprintf(_("^4You fragged ^7%s"), s1), s2));
+				centerprint(strcat(sprintf(_("^4You fragged ^7%s"), s1), s2));
 			}
 		} else { // generic message
 			if(gentle) {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, sprintf(_("^1You were scored against by ^7%s"), s1), s2));
+				centerprint(strcat(sprintf(_("^1You were scored against by ^7%s"), s1), s2));
 			} else {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, sprintf(_("^1You were fragged by ^7%s"), s1), s2));
+				centerprint(strcat(sprintf(_("^1You were fragged by ^7%s"), s1), s2));
 			}
 		}
 	} else if(msg == MSG_KILL_ACTION) {
 		// TODO: invent more centerprints here?
-		centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, _("^1Watch your step!")));
+		centerprint(strcat(_("^1Watch your step!")));
 	}
 }
 
@@ -2560,6 +2400,128 @@ void HUD_Radar(void)
 // Score (#7)
 //
 void HUD_UpdatePlayerTeams();
+void HUD_Score_Rankings(vector pos, vector mySize, entity me, float team_count)
+{
+	float score;
+	entity tm, pl;
+#define SCOREPANEL_MAX_ENTRIES 6
+#define SCOREPANEL_ASPECTRATIO 2
+	const float entries = bound(1, floor(SCOREPANEL_MAX_ENTRIES * mySize_y/mySize_x * SCOREPANEL_ASPECTRATIO), SCOREPANEL_MAX_ENTRIES);
+	const vector fontsize = '1 1 0' * (mySize_y/entries);
+
+	vector rgb, score_color;
+	rgb = '1 1 1';
+	score_color = '1 1 1';
+
+	const float name_size = mySize_x*0.75;
+	const float spacing_size = mySize_x*0.04;
+	const float highlight_alpha = 0.2;
+	float i, me_printed, first_pl;
+	string s;
+	i, first_pl = 0;
+	if (autocvar__hud_configure)
+	{
+		float players_per_team;
+		if (team_count)
+		{
+			// show team scores in the first line
+			float score_size = mySize_x / team_count;
+			players_per_team = max(2, ceil((entries - 1) / team_count));
+			for(i=0; i<team_count; ++i) {
+				if (i == floor((entries - 2) / players_per_team) || (entries == 1 && i == 0))
+					HUD_Panel_DrawHighlight(pos + eX * score_size * i, eX * score_size + eY * fontsize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+				drawstring_aspect(pos + eX * score_size * i, ftos(175 - 23*i), eX * score_size + eY * fontsize_y, GetTeamRGB(ColorByTeam(i)) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
+			}
+			first_pl = 1;
+			pos_y += fontsize_y;
+		}
+		score = 10 + SCOREPANEL_MAX_ENTRIES * 3;
+		for (i=first_pl; i<entries; ++i)
+		{
+			//simulate my score is lower than all displayed players,
+			//so that I don't appear at all showing pure rankings.
+			//This is to better show the difference between the 2 ranking views
+			if (i == entries-1 && autocvar_hud_panel_score_rankings == 1)
+			{
+				rgb = '1 1 0';
+				drawfill(pos, eX * mySize_x + eY * fontsize_y, rgb, highlight_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+				s = GetPlayerName(pl.sv_entnum);
+				score = 7;
+			}
+			else
+			{
+				s = sprintf(_("Player %d"), i + 1 - first_pl);
+				score -= 3;
+			}
+
+			if (team_count)
+				score_color = GetTeamRGB(ColorByTeam(floor((i - first_pl) / players_per_team))) * 0.8;
+			s = textShortenToWidth(s, name_size, fontsize, stringwidth_colors);
+			drawcolorcodedstring(pos + eX * (name_size - stringwidth(s, TRUE, fontsize)), s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+			drawstring(pos + eX * (name_size + spacing_size), ftos(score), fontsize, score_color, panel_fg_alpha, DRAWFLAG_NORMAL);
+			pos_y += fontsize_y;
+		}
+		return;
+	}
+
+	if (!scoreboard_fade_alpha) // the scoreboard too calls HUD_UpdatePlayerTeams
+		HUD_UpdatePlayerTeams();
+	if (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 == COLOR_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);
+			drawstring_aspect(pos + eX * score_size * i, ftos(tm.(teamscores[ts_primary])), eX * score_size + eY * fontsize_y, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
+			++i;
+		}
+		first_pl = 1;
+		pos_y += fontsize_y;
+		tm = teams.sort_next;
+	}
+	i = first_pl;
+
+	do
+	for (pl = players.sort_next; pl && i<entries; pl = pl.sort_next)
+	{
+		if ((team_count && pl.team != tm.team) || pl.team == COLOR_SPECTATOR)
+			continue;
+
+		if (i == entries-1 && !me_printed && pl != me)
+		if (autocvar_hud_panel_score_rankings == 1 && spectatee_status != -1)
+		{
+			for (pl = me.sort_next; pl; pl = pl.sort_next)
+				if (pl.team != COLOR_SPECTATOR)
+					break;
+
+			if (pl)
+				rgb = '1 1 0'; //not last but not among the leading players: yellow
+			else
+				rgb = '1 0 0'; //last: red
+			pl = me;
+		}
+
+		if (pl == me)
+		{
+			if (i == first_pl)
+				rgb = '0 1 0'; //first: green
+			me_printed = 1;
+			drawfill(pos, eX * mySize_x + eY * fontsize_y, rgb, highlight_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+		}
+		if (team_count)
+			score_color = GetTeamRGB(pl.team) * 0.8;
+		s = textShortenToWidth(GetPlayerName(pl.sv_entnum), name_size, fontsize, stringwidth_colors);
+		drawcolorcodedstring(pos + eX * (name_size - stringwidth(s, TRUE, fontsize)), s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+		drawstring(pos + eX * (name_size + spacing_size), ftos(pl.(scores[ps_primary])), fontsize, score_color, panel_fg_alpha, DRAWFLAG_NORMAL);
+		pos_y += fontsize_y;
+		++i;
+	}
+	while (i<entries && team_count && (tm = tm.sort_next) && (tm.team != COLOR_SPECTATOR || (tm = tm.sort_next)));
+}
+
 void HUD_Score(void)
 {
 	if(!autocvar__hud_configure)
@@ -2624,83 +2586,7 @@ void HUD_Score(void)
 	} else if (!teamplay) { // non-teamgames
 		if ((spectatee_status == -1 && !autocvar__hud_configure) || autocvar_hud_panel_score_rankings)
 		{
-#define SCOREPANEL_MAX_ENTRIES 6
-#define SCOREPANEL_ASPECTRATIO 2
-			const float entries = bound(1, floor(SCOREPANEL_MAX_ENTRIES * mySize_y/mySize_x * SCOREPANEL_ASPECTRATIO), SCOREPANEL_MAX_ENTRIES);
-			const float height = mySize_y/entries;
-			const vector fontsize = '0.9 0.9 0' * height;
-			pos_y += height * (1 - 0.9) / 2;
-
-			vector rgb;
-			rgb = '1 1 1';
-
-			const float name_size = mySize_x*0.75;
-			const float highlight_alpha = 0.2;
-			float i, me_printed;
-			string s;
-			if (autocvar__hud_configure)
-			{
-				score = 10 + SCOREPANEL_MAX_ENTRIES * 3;
-				for (i=0; i<entries; ++i)
-				{
-					//simulate my score is lower than all displayed players,
-					//so that I don't appear at all showing pure rankings.
-					//This is to better show the difference between the 2 ranking views
-					if (i == entries-1 && autocvar_hud_panel_score_rankings == 1)
-					{
-						rgb = '1 1 0';
-						drawfill(pos - eY * (height * (1 - 0.9) / 2), eX * mySize_x + eY * height, rgb, highlight_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-						s = GetPlayerName(pl.sv_entnum);
-						score = 7;
-					}
-					else
-					{
-						s = sprintf(_("Player %d"), i+1);
-						score -= 3;
-					}
-
-					s = textShortenToWidth(s, name_size, fontsize, stringwidth_colors);
-					drawcolorcodedstring(pos + eX * (name_size - stringwidth(s, TRUE, fontsize)), s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
-					drawstring(pos + eX * mySize_x*0.79, ftos(score), fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-					pos_y += height;
-				}
-				return;
-			}
-
-			if (!scoreboard_fade_alpha) // the scoreboard too calls HUD_UpdatePlayerTeams
-				HUD_UpdatePlayerTeams();
-
-			for (pl = players.sort_next, i=0; pl && i<entries; pl = pl.sort_next, ++i)
-			{
-				if (pl.team == COLOR_SPECTATOR)
-					continue;
-
-				if (i == entries-1 && !me_printed && pl != me)
-				if (autocvar_hud_panel_score_rankings == 1 && spectatee_status != -1)
-				{
-					for (pl = me.sort_next; pl; pl = pl.sort_next)
-						if (pl.team != COLOR_SPECTATOR)
-							break;
-
-					if (pl)
-						rgb = '1 1 0'; //not last but not among the leading players: yellow
-					else
-						rgb = '1 0 0'; //last: red
-					pl = me;
-				}
-
-				if (pl == me)
-				{
-					if (i == 0)
-						rgb = '0 1 0'; //first: green
-					me_printed = 1;
-					drawfill(pos - eY * (height * (1 - 0.9) / 2), eX * mySize_x + eY * height, rgb, highlight_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-				}
-				s = textShortenToWidth(GetPlayerName(pl.sv_entnum), name_size, fontsize, stringwidth_colors);
-				drawcolorcodedstring(pos + eX * (name_size - stringwidth(s, TRUE, fontsize)), s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
-				drawstring(pos + eX * mySize_x*0.79, ftos(pl.(scores[ps_primary])), fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-				pos_y += height;
-			}
+			HUD_Score_Rankings(pos, mySize, me, 0);
 			return;
 		}
 		// me vector := [team/connected frags id]
@@ -2739,20 +2625,17 @@ 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);
 	} else { // teamgames
-		float max_fragcount;
-		max_fragcount = -99;
-
 		float scores_count, row, column, rows, columns;
 		vector offset;
 		vector score_pos, score_size; //for scores other than myteam
-		if (spectatee_status == -1)
+		if (spectatee_status == -1 || autocvar_hud_panel_score_rankings)
 		{
-			if (autocvar__hud_configure)
-				scores_count = 4;
-			else for(tm = teams.sort_next; tm; tm = tm.sort_next) {
-				if(tm.team == COLOR_SPECTATOR)
-					continue;
+			for(tm = teams.sort_next; tm, tm.team != COLOR_SPECTATOR; tm = tm.sort_next)
 				++scores_count;
+			if (autocvar_hud_panel_score_rankings)
+			{
+				HUD_Score_Rankings(pos, mySize, me, scores_count);
+				return;
 			}
 			rows = mySize_y/mySize_x;
 			rows = bound(1, floor((sqrt(4 * (3/1) * rows * scores_count + rows * rows) + rows + 0.5) / 2), scores_count);
@@ -2780,6 +2663,9 @@ void HUD_Score(void)
 		}
 		else
 			score_size = eX * mySize_x*(1/4) + eY * mySize_y*(1/3);
+
+		float max_fragcount;
+		max_fragcount = -99;
 		for(tm = teams.sort_next; tm; tm = tm.sort_next) {
 			if(tm.team == COLOR_SPECTATOR)
 				continue;
@@ -4073,16 +3959,14 @@ void HUD_InfoMessages(void)
 	fontsize = '0.20 0.20 0' * mySize_y;
 	
 	float a;
-	if(spectatee_status != 0)
-		a = 1;
-	else
-		a = panel_fg_alpha;
+	a = panel_fg_alpha;
 
 	string s;
 	if(!autocvar__hud_configure)
 	{
 		if(spectatee_status && !intermission)
 		{
+			a = 1;
 			if(spectatee_status == -1)
 				s = _("^1Observing");
 			else
@@ -4433,6 +4317,152 @@ void HUD_Physics(void)
 		drawstring_aspect(panel_pos + acceleration_offset, strcat(ftos_decimals(acceleration, 2), "g"), panel_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 }
 
+#define CENTERPRINT_MAX_MSGS 10
+#define CENTERPRINT_MAX_ENTRIES 50
+float cpm_index;
+string centerprint_messages[CENTERPRINT_MAX_MSGS];
+float centerprint_msgID[CENTERPRINT_MAX_MSGS];
+float centerprint_time[CENTERPRINT_MAX_MSGS];
+
+string msg_without_CPID(string s)
+{
+	return substring(s, strstrofs(s, " ", 0) + 1, strlen(s));
+}
+float get_CPID(string s)
+{
+	if(substring(s, 0, 1) != "\r")
+		return 0;
+	return stof(substring(s, 1, strstrofs(s, " ", 0)));
+}
+void centerprint(string strMessage)
+{
+	float i, j;
+
+	if(autocvar_hud_panel_centerprint_time <= 0)
+		return;
+
+	if(strMessage == "")
+		return;
+
+	float new_id = get_CPID(strMessage);
+
+	for (i=0, j=cpm_index; i<CENTERPRINT_MAX_MSGS; ++i, ++j)
+	{
+		if (j == CENTERPRINT_MAX_MSGS)
+			j = 0;
+		if (new_id && new_id == centerprint_msgID[j] && centerprint_time[j] + autocvar_hud_panel_centerprint_time >= time)
+		{
+			if(centerprint_messages[j])
+				strunzone(centerprint_messages[j]);
+			centerprint_messages[j] == strzone(msg_without_CPID(strMessage));
+			centerprint_time[j] = time;
+			return;
+		}
+		if(centerprint_messages[j] == strMessage)
+		{
+			centerprint_time[j] = time;
+			centerprint_msgID[j] = new_id;
+			return;
+		}
+	}
+
+	--cpm_index;
+	if (cpm_index == -1)
+		cpm_index = CENTERPRINT_MAX_MSGS - 1;
+	if(centerprint_messages[cpm_index])
+		strunzone(centerprint_messages[cpm_index]);
+	if (new_id)
+		centerprint_messages[cpm_index] = strzone(msg_without_CPID(strMessage));
+	else
+		centerprint_messages[cpm_index] = strzone(strMessage);
+	centerprint_msgID[cpm_index] = new_id;
+	centerprint_time[cpm_index] = time;
+}
+
+// CenterPrint (#16)
+//
+void HUD_CenterPrint (void)
+{
+	if(!autocvar__hud_configure)
+	{
+		if(!autocvar_hud_panel_centerprint) return;
+	}
+	else
+		hud_configure_active_panel = HUD_PANEL_CENTERPRINT;
+
+	HUD_Panel_UpdateCvars(centerprint);
+
+	HUD_Panel_DrawBg(1);
+	if(panel_bg_padding)
+	{
+		panel_pos += '1 1 0' * panel_bg_padding;
+		panel_size -= '2 2 0' * panel_bg_padding;
+	}
+
+	float entries, height;
+	vector fontsize;
+	// entries = bound(1, floor(CENTERPRINT_MAX_ENTRIES * 4 * panel_size_y/panel_size_x), CENTERPRINT_MAX_ENTRIES);
+	// height = panel_size_y/entries;
+	// fontsize = '1 1 0' * height;
+	height = vid_conheight/40 * autocvar_hud_panel_centerprint_fontscale;
+	fontsize = '1 1 0' * height;
+	entries = bound(1, floor(panel_size_y/height), CENTERPRINT_MAX_ENTRIES);
+
+	float i, j, k, n;
+	float a, sz, fade, align;
+	vector pos;
+	string ts;
+
+	pos = panel_pos;
+	fade = min(autocvar_hud_panel_centerprint_time/8, 0.25);
+	align = bound(0, autocvar_hud_panel_centerprint_align, 1);
+	for (i=0, j=cpm_index; i<CENTERPRINT_MAX_MSGS; ++i, ++j)
+	{
+		if (j == CENTERPRINT_MAX_MSGS)
+			j = 0;
+		if (centerprint_time[j] + autocvar_hud_panel_centerprint_time < time)
+			continue;
+		else if (centerprint_time[j] + autocvar_hud_panel_centerprint_time - fade > time)
+		{
+			a = 1;
+			sz = 1;
+		}
+		else if (centerprint_time[j] + autocvar_hud_panel_centerprint_time > time)
+		{
+			a = (centerprint_time[j] + autocvar_hud_panel_centerprint_time - time) / fade;
+			sz = 0.8 + a * (1 - 0.8);
+		}
+
+		drawfontscale = sz * '1 1 0';
+		n = tokenizebyseparator(centerprint_messages[j], "\n");
+		for(k = 0; k < n; ++k)
+		{
+			getWrappedLine_remaining = argv(k);
+			while(getWrappedLine_remaining)
+			{
+				ts = getWrappedLine(panel_size_x, fontsize, stringwidth_colors);
+				if (ts != "")
+				{
+					if (align)
+						pos_x = panel_pos_x + (panel_size_x - stringwidth(ts, TRUE, fontsize)) * align;
+					drawcolorcodedstring(pos + '0 1 0' * 1.5 * (1 - sz) * fontsize_y, ts, fontsize, a, DRAWFLAG_NORMAL);
+					pos_y += fontsize_y * 1.5;
+				}
+				else
+					pos_y += fontsize_y;
+				if (pos_y > panel_pos_y + panel_size_y - fontsize_y)
+				{
+					drawfontscale = '1 1 0';
+					return;
+				}
+			}
+		}
+		if (a < 1)
+			pos_y -= 1.5 * fontsize_y * (1 - a*a);
+		drawfontscale = '1 1 0';
+	}
+}
+
 /*
 ==================
 Main HUD system
@@ -4482,6 +4512,8 @@ switch (id) {\
 		 HUD_InfoMessages(); break;\
 	case (HUD_PANEL_PHYSICS):\
 		 HUD_Physics(); break;\
+	case (HUD_PANEL_CENTERPRINT):\
+		 HUD_CenterPrint(); break;\
 } ENDS_WITH_CURLY_BRACE
 
 void HUD_Main (void)
@@ -4497,7 +4529,18 @@ void HUD_Main (void)
 		hud_fade_alpha = (1 - scoreboard_fade_alpha);
 
 	if(intermission == 2) // no hud during mapvote
+	{
+		if (autocvar__hud_configure) //force exit from hud config
+		{
+			if (menu_enabled)
+			{
+				menu_enabled = 0;
+				localcmd("togglemenu\n");
+			}
+			cvar_set("_hud_configure", "0");
+		}
 		hud_fade_alpha = 0;
+	}
 	else if(autocvar__menu_alpha == 0 && scoreboard_fade_alpha == 0)
 		hud_fade_alpha = 1;