From ce305509747cb5d0d59d7a812004c5c10f5c8495 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sun, 19 Mar 2017 16:43:56 +0100 Subject: [PATCH] Calculate middle point on CTF initialization --- qcsrc/server/mutators/mutator/gamemode_ctf.qc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/qcsrc/server/mutators/mutator/gamemode_ctf.qc b/qcsrc/server/mutators/mutator/gamemode_ctf.qc index 8a88d5d2e8..2c571991e7 100644 --- a/qcsrc/server/mutators/mutator/gamemode_ctf.qc +++ b/qcsrc/server/mutators/mutator/gamemode_ctf.qc @@ -1375,7 +1375,7 @@ void ctf_FlagSetup(int teamnumber, entity flag) // called when spawning a flag e // NOTE: LEGACY CODE, needs to be re-written! -void havocbot_calculate_middlepoint() +void havocbot_ctf_calculate_middlepoint() { entity f; vector s = '0 0 0'; @@ -1602,9 +1602,6 @@ void havocbot_ctf_reset_role(entity this) if(IS_DEAD(this)) return; - if(havocbot_ctf_middlepoint == '0 0 0') - havocbot_calculate_middlepoint(); - // Check ctf flags if (this.flagcarried) { @@ -2722,6 +2719,8 @@ void ctf_DelayedInit(entity this) // Do this check with a delay so we can wait f if(tmp_entity.team == 0) { ctf_oneflag = true; } } + havocbot_ctf_calculate_middlepoint(); + if(NumTeams(ctf_teams) < 2) // somehow, there's not enough flags! { ctf_teams = 0; // so set the default red and blue teams -- 2.39.2