]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Raptor: fix primary friendly fire
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 8 Oct 2015 21:24:21 +0000 (08:24 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 8 Oct 2015 21:24:38 +0000 (08:24 +1100)
qcsrc/common/vehicles/vehicle/raptor_weapons.qc

index 9c2fd0e5f15a0e4c4212edc71aca6e34ff3c82e1..a5ddb7f6717b4f9d9b891a2e0349005142737f6a 100644 (file)
@@ -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);
     }
 }