From: drjaska <drjaska83@gmail.com>
Date: Sun, 1 Dec 2024 12:36:01 +0000 (+0200)
Subject: Update to 62363c0849f4bdfd931041764d78b40b2ddfcea3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d9e6409eef4937d6978976b49c38e2405ad19f76;p=xonotic%2Fxonotic-data.pk3dir.git

Update to 62363c0849f4bdfd931041764d78b40b2ddfcea3

This reverts commits:
b6cb89e1397f4357e2c358c87812f96796450735
d191b6f033c572758d14b9b2772307317e2956cf
---

diff --git a/qcsrc/server/damage.qc b/qcsrc/server/damage.qc
index 07d996593..8b2af78f2 100644
--- a/qcsrc/server/damage.qc
+++ b/qcsrc/server/damage.qc
@@ -733,24 +733,6 @@ void Damage(entity targ, entity inflictor, entity attacker, float damage, int de
 		mirrordamage = M_ARGV(5, float);
 		force = M_ARGV(6, vector);
 
-		// Dr. Jaska:
-		// Quake 3 DeFRaG's cpm physic's rocketlauncher has 1.2x horizontal force multiplier
-		// This aims to reproduce it in Quake 3 DeFRaG cpm and XDF physics if damagepush_speedfactor is 0
-		// CPMA cpm physics should be active in .arena maps and Quake 3 DeFRaG cpm physics in .defi maps
-		// It is only intended to be used with 250 base force for devastator which matches Q3 if our
-		// target's damageforcescale is also 2
-		if(force)
-		if(q3compat & Q3COMPAT_DEFI)
-		if(autocvar_g_balance_damagepush_speedfactor == 0)
-		if(attacker.(weaponentity).m_weapon == WEP_DEVASTATOR)
-		if(autocvar_g_balance_devastator_force == 250)
-		if(targ.damageforcescale == 2)
-		if((cvar_string("g_mod_physics") == "CPMA") || (cvar_string("g_mod_physics") == "XDF"))
-		{
-			force.x *= 1.2;
-			force.y *= 1.2;
-		}
-
 		if(IS_PLAYER(targ) && damage > 0 && attacker)
 		{
 			for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)