Merge in xonotic/xonotic-data.pk3dir.git: Mario/mute_bot_warnings
git-manager created issue #1541 (closed) on 2013-05-03T17:39:08Z:
Purpose of the branch:
Fixes #1393 (Bot navigation spams console).
Repository: xonotic/xonotic-data.pk3dir.git Commit: bf3933ef Branch: Mario/mute_bot_warnings
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff 'bf3933ef3cbe0d8a30b4635c31370b73da499c26'..'origin/Mario/mute_bot_warnings'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git merge --no-ff 'origin/Mario/mute_bot_warnings'
# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out
git push && git push --delete origin 'Mario/mute_bot_warnings'
Diffstat:
qcsrc/server/bot/navigation.qc | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
Revision log:
commit bf3933ef3cbe0d8a30b4635c31370b73da499c26
Author: Mario
Commit: Mario
Disable hidden bot waypoint warnings, fixes singleplayer console clearing after some time on a map without waypoints
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/qcsrc/server/bot/navigation.qc b/qcsrc/server/bot/navigation.qc
index a5c60e3..95279d5 100644
— a/qcsrc/server/bot/navigation.qc
**+ b/qcsrc/server/bot/navigation.qc
@ -790,7 +790,7
@ void navigation_routerating
e.nearestwaypoint = nwp;
else
{
- dprint, “”);
- //dprint(“FAILED to find a nearest waypoint to ‘“, e.classname,”’ #”, etos(e), “”);
if(e.flags & FL_ITEM)
e.blacklisted = TRUE;
@ -802,7 +802,7
@ void navigation_routerating(entity e, float f, float rangebias)
if(e.blacklisted) {
- dprint(“The entity ‘“, e.classname,”’ is going to be excluded from path finding during this match\n”);
- //dprint(“The entity ‘“, e.classname,”’ is going to be excluded from path finding during this match\n”);
return;
}
}
@ -996,7 +996,7
@ void navigation_goalrating_end() { if not(self.aistatus & AI_STATUS_STUCK) {
- dprint(self.netname, " cannot walk to any goal\n“);
- //dprint(self.netname,” cannot walk to any goal\n“);
self.aistatus |= AI_STATUS_STUCK;
}
@ -1079,14 +1079,14
@ void navigation_unstuck() { if (bot_waypoint_queue_bestgoal) {
- dprint(self.netname,” stuck, reachable waypoint found, heading to it\n“);
- //dprint(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; } else {
- dprint(self.netname,” stuck, cannot walk to any waypoint at all\n“);
- //dprint(self.netname,” stuck, cannot walk to any waypoint at all\n“);
}
bot_waypoint_queue_owner = world;
@ -1098,7 +1098,7
@ void navigation_unstuck() return; // build a new queue
- dprint(self.netname,” stuck, scanning reachable waypoints within “, ftos(search_radius),” qu\n“);
- //dprint(self.netname,” stuck, scanning reachable waypoints within “, ftos(search_radius),” qu\n“);
entity head, first;
@ -1126,7 +1126,7
@ void navigation_unstuck() bot_waypoint_queue_goal = first; else {
- dprint(self.netname,” stuck, cannot walk to any waypoint at all\n“);
- //dprint(self.netname,” stuck, cannot walk to any waypoint at all\n"); bot_waypoint_queue_owner = world; } }