]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Remove monster vehicle targeting
authorMario <mario.mario@y7mail.com>
Fri, 30 Aug 2013 10:22:49 +0000 (20:22 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 30 Aug 2013 10:22:49 +0000 (20:22 +1000)
qcsrc/common/monsters/sv_monsters.qc

index aa0f0d0fbed390a6c91cd9859db9646000cc7308..f3e06ca4359e466b954472852361bf10c862bb56 100644 (file)
@@ -67,8 +67,7 @@ float monster_isvalidtarget (entity targ, entity ent)
        
        if(vlen(targ.origin - ent.origin) >= ent.target_range)
                return FALSE; // enemy is too far away
-               
-       if not(targ.vehicle_flags & VHF_ISVEHICLE)
+       
        if(trace_ent != targ)
                return FALSE; // we can't see the enemy
                
@@ -84,7 +83,6 @@ float monster_isvalidtarget (entity targ, entity ent)
        if(IS_SPEC(targ) || IS_OBSERVER(targ))
                return FALSE; // enemy is a spectator
        
-       if not(targ.vehicle_flags & VHF_ISVEHICLE) // vehicles dont count as alive?
        if(targ.deadflag != DEAD_NO || ent.deadflag != DEAD_NO || targ.health <= 0 || ent.health <= 0)
                return FALSE; // enemy/self is dead
                
@@ -94,7 +92,6 @@ float monster_isvalidtarget (entity targ, entity ent)
        if(targ.monster_owner == ent)
                return FALSE; // don't attack our pet
        
-       if not(targ.vehicle_flags & VHF_ISVEHICLE)
        if(targ.flags & FL_NOTARGET)
                return FALSE; // enemy can't be targeted