From: Mario Date: Thu, 9 Jul 2015 06:40:56 +0000 (+1000) Subject: Fix bots in one flag mode X-Git-Tag: xonotic-v0.8.1~29^2~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f715974f22d9b57b6bb7577c3a3655ec7115f369;p=xonotic%2Fxonotic-data.pk3dir.git Fix bots in one flag mode --- diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc index c870adc84..10b17719a 100644 --- a/qcsrc/server/mutators/gamemode_ctf.qc +++ b/qcsrc/server/mutators/gamemode_ctf.qc @@ -10,11 +10,6 @@ #include "../../warpzonelib/common.qh" #include "../../warpzonelib/mathlib.qh" -// ================================================================ -// Official capture the flag game mode coding, reworked by Samual -// Last updated: September, 2012 -// ================================================================ - void ctf_FakeTimeLimit(entity e, float t) { msg_entity = e; @@ -1512,7 +1507,10 @@ void havocbot_role_ctf_carrier() self.bot_strategytime = time + autocvar_bot_ai_strategyinterval; navigation_goalrating_start(); - havocbot_goalrating_ctf_ourbase(50000); + if(ctf_oneflag) + havocbot_goalrating_ctf_enemybase(50000); + else + havocbot_goalrating_ctf_ourbase(50000); if(self.health<100) havocbot_goalrating_ctf_carrieritems(1000, self.origin, 1000); diff --git a/qcsrc/server/mutators/gamemode_ctf.qh b/qcsrc/server/mutators/gamemode_ctf.qh index 3cac4bd41..c95225e59 100644 --- a/qcsrc/server/mutators/gamemode_ctf.qh +++ b/qcsrc/server/mutators/gamemode_ctf.qh @@ -32,10 +32,7 @@ const vector FLAG_WAYPOINT_OFFSET = ('0 0 64'); const vector FLAG_FLOAT_OFFSET = ('0 0 32'); const vector FLAG_PASS_ARC_OFFSET = ('0 0 -10'); -const vector VEHICLE_FLAG_OFFSET = ('0 0 90'); - - - +const vector VEHICLE_FLAG_OFFSET = ('0 0 96'); const float VEHICLE_FLAG_SCALE = 1.0; // waypoint colors