From: FruitieX <fruitiex@gmail.com>
Date: Fri, 31 Dec 2010 19:29:52 +0000 (+0200)
Subject: fix a stupid typo, add a cvar to autocvars.qh
X-Git-Tag: xonotic-v0.5.0~318^2~133^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9bea989e53bb556e8727bf93ce91fb455e036cb0;p=xonotic%2Fxonotic-data.pk3dir.git

fix a stupid typo, add a cvar to autocvars.qh
---

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index acc82e6b3..fb9afec70 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -725,6 +725,7 @@ float autocvar_g_freezetag_revive_time;
 float autocvar_g_freezetag_warmup;
 #define autocvar_g_friendlyfire cvar("g_friendlyfire")
 #define autocvar_g_friendlyfire_virtual cvar("g_friendlyfire_virtual")
+#define autocvar_g_friendlyfire_virtual_force cvar("g_friendlyfire_virtual_force")
 float autocvar_g_full_getstatus_responses;
 float autocvar_g_fullbrightitems;
 float autocvar_g_fullbrightplayers;
diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 22c3698c2..0c07ad5a7 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -1055,11 +1055,11 @@ float RadiusDamage (entity inflictor, entity attacker, float coredamage, float e
                             {
                                 if(deathtype & HITTYPE_SECONDARY)
                                 {
-                                    force *= autocvar_g_balance_laser_primary_force_other_scale;
+                                    force *= autocvar_g_balance_laser_secondary_force_other_scale;
                                 }
                                 else
                                 {
-                                    force *= autocvar_g_balance_laser_secondary_force_other_scale;
+                                    force *= autocvar_g_balance_laser_primary_force_other_scale;
                                 }
                             }
 						}