X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=189cd9b05633b3c8bc1fd0993f879156057533a3;hb=6d249c399e3e08bac4f671d875e1a58ba52a5a34;hp=7b02f4e5ecdc9a2fe0446c49782089aa4b89dd43;hpb=cf26ba11220f6f3d6280c26040ad311ee92ebeb2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 7b02f4e5e..189cd9b05 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -219,11 +219,6 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype)
 			}
 			f = 0;
 		}
-		else if(g_ctf)
-		{
-			if(g_ctf_ignore_frags)
-				f = 0;
-		}
 	}
 
 	attacker.totalfrags += f;
@@ -378,7 +373,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 					deathtype = KILL_TEAM_BLUE;
 			}
 
-			Send_KillNotification(s, msg, ftos(w), deathtype, MSG_SUICIDE);
+			Send_KillNotification(s, msg, "", deathtype, MSG_SUICIDE);
 		}
 		else if (attacker.classname == "player")
 		{
@@ -443,14 +438,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 
 				Send_KillNotification(a, s, msg, deathtype, MSG_KILL);
 
-				if(g_ctf && targ.flagcarried)
-				{
-					UpdateFrags(attacker, ctf_score_value("score_kill"));
-					PlayerScore_Add(attacker, SP_CTF_FCKILLS, 1);
-					GiveFrags(attacker, targ, 0, deathtype); // for logging
-				}
-				else
-					GiveFrags(attacker, targ, 1, deathtype);
+				GiveFrags(attacker, targ, 1, deathtype);
 
 				if (targ.killcount > 2) {
 					Send_KillNotification(s, ftos(targ.killcount), a, KILL_END_SPREE, MSG_SPREE);
@@ -652,7 +640,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 								attacker.dmg_take += v_x;
 								attacker.dmg_save += v_y;
 								attacker.dmg_inflictor = inflictor;
-								mirrordamage = 0;
+								mirrordamage = v_z; // = 0, to make fteqcc stfu
 								mirrorforce = 0;
 							}
 
@@ -764,15 +752,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
@@ -875,8 +854,6 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 							if(deathtype & HITTYPE_HEADSHOT)
 								headshot = 1;
 						}
-						if(g_ca)
-							PlayerScore_Add(attacker, SP_SCORE, damage * autocvar_g_ca_damage2score_multiplier);
 					}
 				}
 				else
@@ -1069,10 +1046,7 @@ float RadiusDamage (entity inflictor, entity attacker, float coredamage, float e
 						myblastorigin = WarpZone_TransformOrigin(targ, blastorigin);
 
 						// if it's a player, use the view origin as reference
-						if (targ.classname == "player")
-							center = targ.origin + targ.view_ofs;
-						else
-							center = targ.origin + (targ.mins + targ.maxs) * 0.5;
+						center = CENTER_OR_VIEWOFS(targ);
 
 						force = normalize(center - myblastorigin);
 						force = force * (finaldmg / coredamage) * forceintensity;