Merge remote branch 'origin/fruitiex/campaign'

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index b70dde78d96ce34d08595448cef659a070479af8..49f43b9c4dd9d8c2474636f89263955ba680f20c 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -103,8 +103,7 @@ seta crosshair_dot_color "1 0 0" "when != 0, use custom color for the crosshair
 seta crosshair_pickup 0.25
 seta crosshair_pickup_speed 4
 seta crosshair_per_weapon 0    "when 1, each gun will display a different crosshair"
-seta crosshair_color_override 0        "when 1, crosshair_color_* overrides the per-weapon color"
-seta crosshair_color_per_weapon 1 "when 1, each gun will display a different colored crosshair"
+seta crosshair_color_per_weapon 1 "when 1, each gun will display the crosshair with a different color"
 seta crosshair_effect_speed -1 "how fast (in seconds) some crosshair effects should take place, 0 = instant, -1 = 2x weapon switch time"
 seta crosshair_effect_scalefade 1 "use scaling and fading for crosshair effects"
 seta crosshair_hittest 1 "do a crosshair hit evaluation; also, the crosshair is scaled by the given number when aiming at an enemy, and blurred when aiming at a team mate"

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index a9c3525f8b4604f8c6844733d9e9978dd260cd24..eb344da93c67c64d8d66277ec7726593ff512647 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -696,7 +696,6 @@ float autocvar_g_ctf_ignore_frags;
 float autocvar_g_ctf_shield_force;
 float autocvar_g_ctf_shield_max_ratio;
 float autocvar_g_ctf_shield_min_negscore;
-float autocvar_g_ctf_win_mode;
 float autocvar_g_cts_finish_kill_delay;
 float autocvar_g_cts_selfdamage;
 float autocvar_g_deathglow;

diff --git a/qcsrc/server/ctf.qc b/qcsrc/server/ctf.qc
index 23cdae9fbb61d034c575ae4de3dbae29cb5bf19d..b31e1429381ca5637966f9dfd8a0bde4c308474c 100644 (file)
--- a/qcsrc/server/ctf.qc
+++ b/qcsrc/server/ctf.qc
@@ -1008,6 +1008,11 @@ void ctf_init()
        captureshield_min_negscore = autocvar_g_ctf_shield_min_negscore;
        captureshield_max_ratio = autocvar_g_ctf_shield_max_ratio;
        captureshield_force = autocvar_g_ctf_shield_force;
+
+
+//#NO AUTOCVARS START
+       g_ctf_win_mode = cvar("g_ctf_win_mode");
+//#NO AUTOCVARS END
 };
 
 void ctf_setstatus2(entity flag, float shift)

diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc
index 54cb530fe47502e84cc81b922e14ad075a4b48dc..0a70de75f802fb13561c7ccf6eb259788b901023 100644 (file)
--- a/qcsrc/server/g_triggers.qc
+++ b/qcsrc/server/g_triggers.qc
@@ -189,14 +189,12 @@ void multi_use()
 void multi_touch()
 {
        if not(self.spawnflags & 2)
-       {
                if not(other.iscreature)
                        return;
 
-               if(self.team)
-               if(self.team == other.team)
+       if(self.team)
+               if((self.spawnflags & 4 == 0) == (self.team != other.team))
                        return;
-       }
 
 // if the trigger has an angles field, check player's facing direction
        if (self.movedir != '0 0 0')

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 83c494d0982ea0c6f252d44c57508a5b6dee8791..488767e48dd3fab2f7e9ee0fb1009d31cd9322ae 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -150,6 +150,7 @@ void ReadGameCvars()
        }
 
        teams_matter = 0;
+       serverflags &~= SERVERFLAG_TEAMPLAY;
 }
 
 void default_delayedinit()
@@ -172,8 +173,6 @@ void InitGameplayMode()
 
        VoteReset();
 
-       teams_matter = 0;
-
        // make sure only ONE type is selected
        ReadGameCvars();
        WriteGameCvars();
@@ -239,7 +238,6 @@ void InitGameplayMode()
                game = GAME_CTF;
                gamemode_name = "Capture the Flag";
                ActivateTeamplay();
-               g_ctf_win_mode = autocvar_g_ctf_win_mode;
                g_ctf_ignore_frags = autocvar_g_ctf_ignore_frags;
                if(g_ctf_win_mode == 2)
                {