From 9bea989e53bb556e8727bf93ce91fb455e036cb0 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Fri, 31 Dec 2010 21:29:52 +0200 Subject: [PATCH] fix a stupid typo, add a cvar to autocvars.qh --- qcsrc/server/autocvars.qh | 1 + qcsrc/server/g_damage.qc | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index acc82e6b32..fb9afec706 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 22c3698c28..0c07ad5a74 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; } } } -- 2.39.2