X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Foverkill%2Fsv_overkill.qc;h=412b5276b061512be1d1511b2d9afbdc4c644f3d;hb=b5544a965e510602dd062e07c5b8c6be688f29c2;hp=21a191a0e67c82b080d962ec034fa668fa997324;hpb=6339d96deaae4960cea32c7eff9ecf85c2eb0752;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index 21a191a0e..412b5276b 100644
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -11,7 +11,7 @@ float autocvar_g_overkill_ammo_charge_limit;
 bool autocvar_g_overkill_filter_healthmega;
 bool autocvar_g_overkill_filter_armormedium;
 bool autocvar_g_overkill_filter_armorbig;
-bool autocvar_g_overkill_filter_armorlarge;
+bool autocvar_g_overkill_filter_armormega;
 
 .float ok_lastwep;
 .float ok_item;
@@ -98,12 +98,11 @@ MUTATOR_HOOKFUNCTION(ok, PlayerDamage_Calculate, CBC_ORDER_LAST)
 	entity frag_target = M_ARGV(2, entity);
 	float frag_deathtype = M_ARGV(3, float);
 
-	if(IS_PLAYER(frag_attacker) && IS_PLAYER(frag_target))
+	if(IS_PLAYER(frag_attacker) && (IS_PLAYER(frag_target) || IS_VEHICLE(frag_target) || IS_TURRET(frag_target)))
 	if(DEATH_ISWEAPON(frag_deathtype, WEP_BLASTER))
 	{
 		if(frag_attacker != frag_target)
-		if(frag_target.health > 0)
-		if(STAT(FROZEN, frag_target) == 0)
+		if(!STAT(FROZEN, frag_target))
 		if(!IS_DEAD(frag_target))
 		{
 			Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_SECONDARY_NODAMAGE);
@@ -164,7 +163,7 @@ MUTATOR_HOOKFUNCTION(ok, ForbidThrowCurrentWeapon)
 
 MUTATOR_HOOKFUNCTION(ok, PlayerPreThink)
 {
-	if(intermission_running || gameover)
+	if(gameover)
 		return;
 
 	entity player = M_ARGV(0, entity);
@@ -281,8 +280,7 @@ MUTATOR_HOOKFUNCTION(ok, OnEntityPreSpawn)
 			wep.nextthink = time + 0.1;
 			return true;
 		}
-
-		if(ent.classname == "item_invincible")
+		else if(ent.classname == "item_invincible")
 		{
 			entity wep = new(weapon_rpc);
 			setorigin(wep, ent.origin);
@@ -312,10 +310,8 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem)
 	{
 		case ITEM_HealthMega: return autocvar_g_overkill_filter_healthmega;
 		case ITEM_ArmorMedium: return autocvar_g_overkill_filter_armormedium;
-		// WARNING: next two statements look wrong because of inconsistency between cvar names and code
-		// armor cvars need renaming to be consistent with their health counterparts
-		case ITEM_ArmorLarge: return autocvar_g_overkill_filter_armorbig;
-		case ITEM_ArmorMega: return autocvar_g_overkill_filter_armorlarge;
+		case ITEM_ArmorBig: return autocvar_g_overkill_filter_armorbig;
+		case ITEM_ArmorMega: return autocvar_g_overkill_filter_armormega;
 	}
 
 	return true;