}
}
-void turret_damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector vforce)
+void turret_damage (entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector vforce)
{
// Enough already!
if(self.deadflag == DEAD_DEAD)
turret_projectile_explode();
}
-void turret_projectile_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector vforce)
+void turret_projectile_damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector vforce)
{
self.velocity += vforce;
self.health -= damage;
return -5;
// Cant touch this
- if(e_target.vehicle_flags & VHF_ISVEHICLE)
+ if(IS_VEHICLE(e_target))
{
if (e_target.vehicle_health <= 0)
return -6;
e = nextent(world);
while (e)
{
- if (e.turret_flags & TUR_FLAG_ISTURRET)
+ if (IS_TURRET(e))
{
load_unit_settings(e,e.cvar_basename,1);
TUR_ACTION(self.turretid, TR_THINK);
TUR_ACTION(tur_id, TR_SETUP);
- if(MUTATOR_CALLHOOK(TurretSpawn))
+ if(MUTATOR_CALLHOOK(TurretSpawn, self))
return false;
return true;