From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 18 Apr 2012 14:32:59 +0000 (+0200)
Subject: reindent RadiusDamage, it was a mess
X-Git-Tag: xonotic-v0.7.0~334
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ed76a1fd3fe898dd8c9e505c08c7ea418fff8038;p=xonotic%2Fxonotic-data.pk3dir.git

reindent RadiusDamage, it was a mess
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index b32d3ac6b..34b31be1a 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -981,7 +981,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 
 float RadiusDamage_running;
 float RadiusDamage (entity inflictor, entity attacker, float coredamage, float edgedamage, float rad, entity ignore, float forceintensity, float deathtype, entity directhitentity)
-// Returns total damage applies to creatures
+	// Returns total damage applies to creatures
 {
 	entity	targ;
 	float	finaldmg;
@@ -1013,18 +1013,18 @@ float RadiusDamage (entity inflictor, entity attacker, float coredamage, float e
 	total_damage_to_creatures = 0;
 
 	if(deathtype != (WEP_HOOK | HITTYPE_SECONDARY | HITTYPE_BOUNCE)) // only send gravity bomb damage once
-	if(DEATH_WEAPONOF(deathtype) != WEP_TUBA) // do not send tuba damage (bandwidth hog)
-	{
-		force = inflictor.velocity;
-		if(vlen(force) == 0)
-			force = '0 0 -1';
-		else
-			force = normalize(force);
-		if(forceintensity >= 0)
-			Damage_DamageInfo(blastorigin, coredamage, edgedamage, rad, forceintensity * force, deathtype, 0, attacker);
-		else
-			Damage_DamageInfo(blastorigin, coredamage, edgedamage, -rad, (-forceintensity) * force, deathtype, 0, attacker);
-	}
+		if(DEATH_WEAPONOF(deathtype) != WEP_TUBA) // do not send tuba damage (bandwidth hog)
+		{
+			force = inflictor.velocity;
+			if(vlen(force) == 0)
+				force = '0 0 -1';
+			else
+				force = normalize(force);
+			if(forceintensity >= 0)
+				Damage_DamageInfo(blastorigin, coredamage, edgedamage, rad, forceintensity * force, deathtype, 0, attacker);
+			else
+				Damage_DamageInfo(blastorigin, coredamage, edgedamage, -rad, (-forceintensity) * force, deathtype, 0, attacker);
+		}
 
 	stat_damagedone = 0;
 
@@ -1127,47 +1127,47 @@ float RadiusDamage (entity inflictor, entity attacker, float coredamage, float e
 						// laser force adjustments :P
 						if(DEATH_WEAPONOF(deathtype) == WEP_LASER)
 						{
-                            if (targ == attacker)
-                            {
-                                vector vel;
-
-                                float force_zscale;
-                                float force_velocitybiasramp;
-                                float force_velocitybias;
-
-                                force_velocitybiasramp = autocvar_sv_maxspeed;
-                                if(deathtype & HITTYPE_SECONDARY)
-                                {
-                                    force_zscale = autocvar_g_balance_laser_secondary_force_zscale;
-                                    force_velocitybias = autocvar_g_balance_laser_secondary_force_velocitybias;
-                                }
-                                else
-                                {
-                                    force_zscale = autocvar_g_balance_laser_primary_force_zscale;
-                                    force_velocitybias = autocvar_g_balance_laser_primary_force_velocitybias;
-                                }
-
-                                vel = targ.velocity;
-                                vel_z = 0;
-                                vel = normalize(vel) * bound(0, vlen(vel) / force_velocitybiasramp, 1) * force_velocitybias;
-                                force =
-                                    vlen(force)
-                                    *
-                                    normalize(normalize(force) + vel);
-
-                                force_z *= force_zscale;
-                            }
-                            else
-                            {
-                                if(deathtype & HITTYPE_SECONDARY)
-                                {
-                                    force *= autocvar_g_balance_laser_secondary_force_other_scale;
-                                }
-                                else
-                                {
-                                    force *= autocvar_g_balance_laser_primary_force_other_scale;
-                                }
-                            }
+							if (targ == attacker)
+							{
+								vector vel;
+
+								float force_zscale;
+								float force_velocitybiasramp;
+								float force_velocitybias;
+
+								force_velocitybiasramp = autocvar_sv_maxspeed;
+								if(deathtype & HITTYPE_SECONDARY)
+								{
+									force_zscale = autocvar_g_balance_laser_secondary_force_zscale;
+									force_velocitybias = autocvar_g_balance_laser_secondary_force_velocitybias;
+								}
+								else
+								{
+									force_zscale = autocvar_g_balance_laser_primary_force_zscale;
+									force_velocitybias = autocvar_g_balance_laser_primary_force_velocitybias;
+								}
+
+								vel = targ.velocity;
+								vel_z = 0;
+								vel = normalize(vel) * bound(0, vlen(vel) / force_velocitybiasramp, 1) * force_velocitybias;
+								force =
+									vlen(force)
+									*
+									normalize(normalize(force) + vel);
+
+								force_z *= force_zscale;
+							}
+							else
+							{
+								if(deathtype & HITTYPE_SECONDARY)
+								{
+									force *= autocvar_g_balance_laser_secondary_force_other_scale;
+								}
+								else
+								{
+									force *= autocvar_g_balance_laser_primary_force_other_scale;
+								}
+							}
 						}
 
 						//if (targ == attacker)