From: TimePath Date: Thu, 8 Oct 2015 21:24:21 +0000 (+1100) Subject: Raptor: fix primary friendly fire X-Git-Tag: xonotic-v0.8.2~1843 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=93394398587d6f72b8865119dd153b9bf365cd2d;p=xonotic%2Fxonotic-data.pk3dir.git Raptor: fix primary friendly fire --- diff --git a/qcsrc/common/vehicles/vehicle/raptor_weapons.qc b/qcsrc/common/vehicles/vehicle/raptor_weapons.qc index 9c2fd0e5f..a5ddb7f67 100644 --- a/qcsrc/common/vehicles/vehicle/raptor_weapons.qc +++ b/qcsrc/common/vehicles/vehicle/raptor_weapons.qc @@ -73,7 +73,7 @@ METHOD(RaptorCannon, wr_think, void(entity thiswep, entity actor, bool fire1, bo vehicles_projectile(EFFECT_RAPTOR_MUZZLEFLASH.eent_eff_name, SND(LASERGUN_FIRE), org, normalize(dir + randomvec() * autocvar_g_vehicle_raptor_cannon_spread) * autocvar_g_vehicle_raptor_cannon_speed, autocvar_g_vehicle_raptor_cannon_damage, autocvar_g_vehicle_raptor_cannon_radius, autocvar_g_vehicle_raptor_cannon_force, 0, - DEATH_VH_RAPT_CANNON, PROJECTILE_RAPTORCANNON, 0, true, true, veh ? veh : player); + DEATH_VH_RAPT_CANNON, PROJECTILE_RAPTORCANNON, 0, true, true, player); weapon_thinkf(player, WFRAME_FIRE1, 0, w_ready); } }