X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=db23f49db20fcc7cabee39fa95d7dcb0868557b7;hb=d9708336de4c01e81ea08bb205093b676b7cb882;hp=7517283caae77d9f2a75ca4f6d23f177328be3d5;hpb=45ac9fc0248eed87497d14ed517d41867412b13c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 7517283ca..db23f49db 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -209,7 +209,7 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype)
 			}
 			f = 0;
 		}
-		else if(g_ctf)
+		else if(g_ctf) // FIXCTF
 		{
 			if(g_ctf_ignore_frags)
 				f = 0;
@@ -229,32 +229,34 @@ string Obituary_ExtraFragInfo(entity player) // Extra fragmessage information
 	string handicap_output;
 	string output;
 
-	// health/armor of attacker (person who killed you)
-	if(autocvar_sv_fraginfo_stats && (player.health >= 1))
-		if((autocvar_sv_fraginfo_stats == 2) || inWarmupStage)
+	if(autocvar_sv_fraginfo && ((autocvar_sv_fraginfo == 2) || inWarmupStage))
+	{
+		// health/armor of attacker (person who killed you)
+		if(autocvar_sv_fraginfo_stats && (player.health >= 1))
 			health_output = strcat("^7(Health ^1", ftos(rint(player.health)), "^7 / Armor ^2", ftos(rint(player.armorvalue)), "^7)");
-	
-	// ping display
-	if(autocvar_sv_fraginfo_ping)
-		ping_output = ((clienttype(player) == CLIENTTYPE_BOT) ? "^2Bot" : strcat("Ping ", ((player.ping >= 150) ? "^1" : "^2"), ftos(rint(player.ping)), "ms"));
 		
-	// handicap display 
-	if(autocvar_sv_fraginfo_handicap) 
-	{
-		if(autocvar_sv_fraginfo_handicap == 2)	
-			handicap_output = strcat(output, strcat("Handicap ^2", ((player.cvar_cl_handicap <= 1) ? "Off" : ftos(rint(player.cvar_cl_handicap)))));
-		else if(player.cvar_cl_handicap) // with _handicap 1, only show this if there actually is a handicap enabled.	
-			handicap_output = strcat("Handicap ^2", ftos(rint(player.cvar_cl_handicap)));
+		// ping display
+		if(autocvar_sv_fraginfo_ping)
+			ping_output = ((clienttype(player) == CLIENTTYPE_BOT) ? "^2Bot" : strcat("Ping ", ((player.ping >= 150) ? "^1" : "^2"), ftos(rint(player.ping)), "ms"));
+			
+		// handicap display 
+		if(autocvar_sv_fraginfo_handicap) 
+		{
+			if(autocvar_sv_fraginfo_handicap == 2)	
+				handicap_output = strcat(output, strcat("Handicap ^2", ((player.cvar_cl_handicap <= 1) ? "Off" : ftos(rint(player.cvar_cl_handicap)))));
+			else if(player.cvar_cl_handicap) // with _handicap 1, only show this if there actually is a handicap enabled.	
+				handicap_output = strcat("Handicap ^2", ftos(rint(player.cvar_cl_handicap)));
+		}
+		
+		// format the string
+		output = strcat(health_output, (health_output ? ((ping_output || handicap_output) ? " ^7(" : "") : ((ping_output || handicap_output) ? "^7(" : "")), 
+			ping_output, (handicap_output ? "^7 / " : ""), 
+			handicap_output, ((ping_output || handicap_output) ? "^7)" : ""));
+		
+		// add new line to the beginning if there is a message
+		if(output) { output = strcat("\n", output); }
 	}
 	
-	// format the string
-	output = strcat(health_output, (health_output ? ((ping_output || handicap_output) ? " ^7(" : "") : ((ping_output || handicap_output) ? "^7(" : "")), 
-		ping_output, (handicap_output ? "^7 / " : ""), 
-		handicap_output, ((ping_output || handicap_output) ? "^7)" : ""));
-	
-	// add new line to the beginning if there is a message
-	if(output) { output = strcat("\n", output); }
-		
 	return output;
 }
 
@@ -404,7 +406,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 					PlayerStats_Event(targ, PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM, 1);
 				}
 
-				if((autocvar_sv_fraginfo_typefrag) && (targ.BUTTON_CHAT)) {
+				if(targ.BUTTON_CHAT) {
 					Send_CSQC_KillCenterprint(attacker, s, Obituary_ExtraFragInfo(targ), KILL_TYPEFRAG, MSG_KILL);
 					Send_CSQC_KillCenterprint(targ, a, Obituary_ExtraFragInfo(attacker), KILL_TYPEFRAGGED, MSG_KILL);
 				} else {
@@ -427,7 +429,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 
 				if(g_ctf && targ.flagcarried)
 				{
-					UpdateFrags(attacker, ctf_score_value("score_kill"));
+					UpdateFrags(attacker, ctf_ReadScore("score_kill")); // FIXCTF
 					PlayerScore_Add(attacker, SP_CTF_FCKILLS, 1);
 					GiveFrags(attacker, targ, 0, deathtype); // for logging
 				}
@@ -748,15 +750,6 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 				damage = damage * autocvar_g_balance_selfdamagepercent;	// Partial damage if the attacker hits himself
 		}
 
-		// CTF: reduce damage/force
-		if(g_ctf)
-		if(targ == attacker)
-		if(targ.flagcarried)
-		{
-			damage = damage * autocvar_g_ctf_flagcarrier_selfdamage;
-			force = force * autocvar_g_ctf_flagcarrier_selfforce;
-		}
-
 		if(g_runematch)
 		{
 			// apply strength rune