minor cleanup

diff --git a/bal-wep-samual.cfg b/bal-wep-samual.cfg
index 5451b3d237987b399b75a5f3ff7d4519f7c62935..049e080cb21360c2af7f6a161225a0d4c134b1b5 100644 (file)
--- a/bal-wep-samual.cfg
+++ b/bal-wep-samual.cfg
@@ -593,8 +593,8 @@ set g_balance_rifle_secondary_damagefalloff_forcehalflife 0
 set g_balance_rifle_secondary_damagefalloff_halflife 0
 set g_balance_rifle_secondary_damagefalloff_maxdist 0
 set g_balance_rifle_secondary_damagefalloff_mindist 0
-set g_balance_rifle_secondary_headshot_multiplier 0
 set g_balance_rifle_secondary_force 50
+set g_balance_rifle_secondary_headshot_multiplier 0
 set g_balance_rifle_secondary_refire 0.9
 set g_balance_rifle_secondary_reload 0
 set g_balance_rifle_secondary_shots 4

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index 97c6d028c146ea586f3e8e31fd89c957f7caf684..1b2a56176f50ac16a1d733ec18e9a7986446a1a2 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -593,8 +593,8 @@ set g_balance_rifle_secondary_damagefalloff_forcehalflife 0
 set g_balance_rifle_secondary_damagefalloff_halflife 0
 set g_balance_rifle_secondary_damagefalloff_maxdist 0
 set g_balance_rifle_secondary_damagefalloff_mindist 0
-set g_balance_rifle_secondary_headshot_multiplier 0
 set g_balance_rifle_secondary_force 50
+set g_balance_rifle_secondary_headshot_multiplier 0
 set g_balance_rifle_secondary_refire 0.9
 set g_balance_rifle_secondary_reload 0
 set g_balance_rifle_secondary_shots 4

diff --git a/qcsrc/common/weapons/weapon/rifle.qc b/qcsrc/common/weapons/weapon/rifle.qc
index f60888484c61813f8124dbdf8383ea184fa9cd5d..265a27b93761d7af799e9ac9d9d10a0e208764e6 100644 (file)
--- a/qcsrc/common/weapons/weapon/rifle.qc
+++ b/qcsrc/common/weapons/weapon/rifle.qc
@@ -29,7 +29,7 @@ void W_Rifle_FireBullet(Weapon thiswep, .entity weaponentity, int deathtype, Sou
                w_shotorg = actor.origin + actor.view_ofs + ((w_shotorg - actor.origin - actor.view_ofs) * v_forward) * v_forward;
        }
 
-       for(float i = 0; i < pShots; ++i)
+       for(int i = 0; i < pShots; ++i)
                fireBullet_falloff(actor, weaponentity, w_shotorg, w_shotdir, pSpread,
                        pSolidPenetration, pDamage, pDF_HalfLife, pDF_MinDist,
                        pDF_MaxDist, pHeadshotDamage, pForce, pDF_ForceHalfLife,

diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc
index 4c811b7c01651c868ea5273caa0b90334a7e06d1..cd19bd3845c33e3ad5dccbda5651edd8c397be95 100644 (file)
--- a/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@ -363,10 +363,10 @@ void fireBullet_trace_callback(vector start, vector hit, vector end)
 
 void fireBullet_falloff(entity this, .entity weaponentity, vector start, vector dir,
                         float spread, float max_solid_penetration, float damage,
-                       float falloff_halflife, float falloff_mindist,
-                       float falloff_maxdist, float headshot_multiplier,
-                       float force, float falloff_forcehalflife,
-                       float dtype, entity tracer_effect, bool do_antilag)
+                        float falloff_halflife, float falloff_mindist,
+                        float falloff_maxdist, float headshot_multiplier,
+                        float force, float falloff_forcehalflife,
+                        float dtype, entity tracer_effect, bool do_antilag)
 {
        dir = normalize(dir + randomvec() * spread);
        vector end = start + dir * max_shot_distance;