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

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index acc82e6b3210ef84a934c426ee94a51dd367dc61..fb9afec70627e9e4a2975bf28b405d5d9fbeefb9 100644 (file)
--- 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 22c3698c2853de266c921260e618b77190f15ef1..0c07ad5a74de568af22a5fbb73cdf7345a4ba439 100644 (file)
--- 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;
                                 }
                             }
                                                }