Allow a smaller Electro comboradius for triggering through walls (plays better)

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / bot / navigation.qc

diff --git a/qcsrc/server/bot/navigation.qc b/qcsrc/server/bot/navigation.qc
index 0aa419038e344f2e0829efb8a46d69de29e4ac43..9160c1133ab4ba9e50bcb3972dea7492918d85fd 100644 (file)
--- a/qcsrc/server/bot/navigation.qc
+++ b/qcsrc/server/bot/navigation.qc
@@ -903,7 +903,7 @@ void navigation_poptouchedgoals()
                        if(self.aistatus & AI_STATUS_WAYPOINT_PERSONAL_GOING)
                        if(self.goalcurrent.wpflags & WAYPOINTFLAG_PERSONAL && self.goalcurrent.owner==self)
                        {
-                               self.aistatus &~= AI_STATUS_WAYPOINT_PERSONAL_GOING;
+                               self.aistatus &= ~AI_STATUS_WAYPOINT_PERSONAL_GOING;
                                self.aistatus |= AI_STATUS_WAYPOINT_PERSONAL_REACHED;
                        }
                        navigation_poproute();
@@ -929,7 +929,7 @@ void navigation_poptouchedgoals()
 
        // HACK: remove players/bots as goals, they can lead a bot to unexpected places (cliffs, lava, etc)
        // TODO: rate waypoints near the targetted player at that moment, instead of the player itself
-       if(self.goalcurrent.classname=="player")
+       if(IS_PLAYER(self.goalcurrent))
                navigation_poproute();
 
        // aid for detecting jump pads better (distance based check fails sometimes)
@@ -950,7 +950,7 @@ void navigation_poptouchedgoals()
                                if(self.aistatus & AI_STATUS_WAYPOINT_PERSONAL_GOING)
                                if(self.goalcurrent.wpflags & WAYPOINTFLAG_PERSONAL && self.goalcurrent.owner==self)
                                {
-                                       self.aistatus &~= AI_STATUS_WAYPOINT_PERSONAL_GOING;
+                                       self.aistatus &= ~AI_STATUS_WAYPOINT_PERSONAL_GOING;
                                        self.aistatus |= AI_STATUS_WAYPOINT_PERSONAL_REACHED;
                                }
 
@@ -965,7 +965,7 @@ void navigation_poptouchedgoals()
                if(self.aistatus & AI_STATUS_WAYPOINT_PERSONAL_GOING)
                if(self.goalcurrent.wpflags & WAYPOINTFLAG_PERSONAL && self.goalcurrent.owner==self)
                {
-                       self.aistatus &~= AI_STATUS_WAYPOINT_PERSONAL_GOING;
+                       self.aistatus &= ~AI_STATUS_WAYPOINT_PERSONAL_GOING;
                        self.aistatus |= AI_STATUS_WAYPOINT_PERSONAL_REACHED;
                }
 
@@ -1088,7 +1088,7 @@ void navigation_unstuck()
                                bot_debug(strcat(self.netname, " stuck, reachable waypoint found, heading to it\n"));
                                navigation_routetogoal(bot_waypoint_queue_bestgoal, self.origin);
                                self.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
-                               self.aistatus &~= AI_STATUS_STUCK;
+                               self.aistatus &= ~AI_STATUS_STUCK;
                        }
                        else
                        {
@@ -1147,7 +1147,7 @@ void debugresetnodes()
 
 void debugnode(vector node)
 {
-       if not(self.classname=="player")
+       if not(IS_PLAYER(self))
                return;
 
        if(debuglastnode=='0 0 0')