X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qc;h=c5cc244f9fa3b6baad33dd29aca210641551dbc4;hb=b46fdcee5c729ccdf485d908803d06bbfdac2a8c;hp=a4e0e9a2097dda82b6e804447ff06db560c79bc9;hpb=1cbdd332a04d4926af7f5f9116e26fd361730c0f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index a4e0e9a20..c5cc244f9 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -477,7 +477,7 @@ void HUD_Panel_ExportCfg(string cfgname)
 					fputs(fh, strcat("seta hud_panel_", panel_name, "_complainbubble_color_unavailable \"", cvar_string(strcat("hud_panel_", panel_name, "_complainbubble_color_unavailable")), "\"", "\n"));
 					fputs(fh, strcat("seta hud_panel_", panel_name, "_ammo_color \"", cvar_string(strcat("hud_panel_", panel_name, "_ammo_color")), "\"", "\n"));
 					fputs(fh, strcat("seta hud_panel_", panel_name, "_ammo_alpha \"", cvar_string(strcat("hud_panel_", panel_name, "_ammo_alpha")), "\"", "\n"));
-					fputs(fh, strcat("seta hud_panel_", panel_name, "_aspect \"", cvar_string(strcat("hud_panel_", panel_name, "_ammo_alpha")), "\"", "\n"));
+					fputs(fh, strcat("seta hud_panel_", panel_name, "_aspect \"", cvar_string(strcat("hud_panel_", panel_name, "_aspect")), "\"", "\n"));
 					break;
 				case HUD_PANEL_AMMO:
 					fputs(fh, strcat("seta hud_panel_", panel_name, "_onlycurrent \"", cvar_string(strcat("hud_panel_", panel_name, "_onlycurrent")), "\"", "\n"));
@@ -2434,6 +2434,25 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
 		
 		if (stof(s2) > 2) // killcount > 2
 			print ("^1",s1,"^1 ended it all after a ",s2," kill spree\n");
+	} else if(msg == MSG_KILL_MELEE) { // handle melee types separately
+		if(type == KILL_FRAG_GAUNTLET) {
+			if(alsoprint)
+			{
+				if(gentle) {
+					print ("^1", s1, "^1 got too close to", s2, "^1's gauntlet\n");
+				} else {
+					print ("^1", s1, "^1 was cut in half by", s2, "^1's gauntlet\n");
+				}
+			}
+		}
+		else if(type == KILL_FRAG_SHOTGUN_MELEE)
+		{
+			if(alsoprint)
+			{
+				print ("^7", s2, "^7 slapped ", s1, "^7 around a bit with a large ^2shotgun\n");
+			}
+		}
+		HUD_KillNotify_Push(s1, s2, 1, type);
 	} else if(msg == MSG_KILL) {
 		w = DEATH_WEAPONOF(type);
 		if(WEP_VALID(w)) {
@@ -2999,6 +3018,14 @@ void HUD_Notify (void)
 				self = get_weaponinfo(killnotify_deathtype[j]);
 				s = strcat("weapon", self.netname);
 			}
+			else if(killnotify_deathtype[j] == KILL_FRAG_GAUNTLET)
+			{
+				s = "notify_melee";
+			}
+			else if(killnotify_deathtype[j] == KILL_FRAG_SHOTGUN_MELEE)
+			{
+				s = "notify_melee";
+			}
 			else if(killnotify_deathtype[j] == KILL_TEAM_RED)
 			{
 				s = "notify_teamkill_red";