X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ftturrets%2Funits%2Funit_ewheel.qc;h=aff4c0aec907ad77cb2a5a9a2ee8d2001ef72f54;hb=fe8c7510919a64ff76afde8eb94bbb29bf293c3b;hp=3d84386a4932599be18198ffaa7b29bef633541b;hpb=ccb3e10e8fe59662e9e989a1946dd18894124349;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/tturrets/units/unit_ewheel.qc b/qcsrc/server/tturrets/units/unit_ewheel.qc index 3d84386a4..aff4c0aec 100644 --- a/qcsrc/server/tturrets/units/unit_ewheel.qc +++ b/qcsrc/server/tturrets/units/unit_ewheel.qc @@ -59,12 +59,13 @@ void ewheel_attack() proj.bot_dodgerating = self.shot_dmg; proj.think = turret_ewheel_projectile_explode; proj.nextthink = time + 9; - proj.solid = SOLID_BBOX; + //proj.solid = SOLID_TRIGGER; proj.movetype = MOVETYPE_FLYMISSILE; proj.velocity = normalize(self.tur_shotdir_updated + randomvec() * self.shot_spread) * self.shot_speed; proj.touch = turret_ewheel_projectile_explode; proj.enemy = self.enemy; proj.flags = FL_PROJECTILE | FL_NOTARGET; + PROJECTILE_MAKETRIGGER(proj); CSQCProjectile(proj, TRUE, PROJECTILE_LASER, TRUE); @@ -285,7 +286,9 @@ void turret_ewheel_dinit() } self.target_select_flags = TFL_TARGETSELECT_PLAYERS | TFL_TARGETSELECT_RANGELIMTS | TFL_TARGETSELECT_TEAMCHECK | TFL_TARGETSELECT_LOS; + self.target_select_flags = TFL_TARGETSELECT_RANGELIMTS | TFL_TARGETSELECT_TEAMCHECK | TFL_TARGETSELECT_LOS; self.target_validate_flags = TFL_TARGETSELECT_PLAYERS | TFL_TARGETSELECT_RANGELIMTS | TFL_TARGETSELECT_TEAMCHECK;// | TFL_TARGETSELECT_LOS; + self.target_validate_flags = TFL_TARGETSELECT_RANGELIMTS | TFL_TARGETSELECT_TEAMCHECK;// | TFL_TARGETSELECT_LOS; self.damage_flags |= TFL_DMG_DEATH_NOGIBS; self.iscreature = TRUE; @@ -307,7 +310,7 @@ void turret_ewheel_dinit() self.tur_head.aim_speed = cvar("g_turrets_unit_ewheel_turnrate"); self.tur_head.aim_speed = self.tur_head.aim_speed / (1 / self.ticrate); - if (!turret_tag_setup()) + if (!turret_tag_fire_update()) dprint("Warning: Turret ",self.classname, " faild to initialize md3 tags\n"); //setorigin(self,self.origin + '0 0 128');