From 02faf878d8ad06c1cbebf1afe57b21fd496717ab Mon Sep 17 00:00:00 2001 From: div0 Date: Sun, 22 Nov 2009 19:58:53 +0000 Subject: [PATCH] fixing teleport waypoints in scripting git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8315 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/bot/havocbot/havocbot.qc | 10 ++++++++++ data/qcsrc/server/bot/navigation.qc | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/data/qcsrc/server/bot/havocbot/havocbot.qc b/data/qcsrc/server/bot/havocbot/havocbot.qc index b3045d3f0..44c39e666 100644 --- a/data/qcsrc/server/bot/havocbot/havocbot.qc +++ b/data/qcsrc/server/bot/havocbot/havocbot.qc @@ -1294,12 +1294,22 @@ float havocbot_moveto(vector pos) other.absmax = pos; other.dphitcontentsmask = self.dphitcontentsmask; if(ExactTriggerHit()) + { wp.wpflags |= WAYPOINTFLAG_TELEPORT; + s.lastteleporttime = 0; + } remove(other); self = s; other = o; } +/* + if(wp.wpflags & WAYPOINTFLAG_TELEPORT) + print("routing to a teleporter\n"); + else + print("routing to a non-teleporter\n"); +*/ + return CMD_STATUS_EXECUTING; } diff --git a/data/qcsrc/server/bot/navigation.qc b/data/qcsrc/server/bot/navigation.qc index b744d5c72..cb6d16c3f 100644 --- a/data/qcsrc/server/bot/navigation.qc +++ b/data/qcsrc/server/bot/navigation.qc @@ -842,7 +842,7 @@ void navigation_poptouchedgoals() if(self.goalcurrent.wpflags & WAYPOINTFLAG_TELEPORT) { if(self.lastteleporttime>0) - if(time-self.lastteleporttime<0.15) + if(time-self.lastteleporttime<(self.goalcurrent.wpflags & WAYPOINTFLAG_PERSONAL)?2:0.15) { if(self.aistatus & AI_STATUS_WAYPOINT_PERSONAL_GOING) if(self.goalcurrent.wpflags & WAYPOINTFLAG_PERSONAL && self.goalcurrent.owner==self) -- 2.39.2