Merge branch 'master' into terencehill/ca_fixes

[xonotic/xonotic-data.pk3dir.git] / gamemodes.cfg

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 08b988273ef0302b9020a57af8a3c7872c87ba16..8aebf05bb9bc0ea27a452c277975e58567327ac4 100644 (file)
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -360,8 +360,6 @@ set g_keepawayball_effects 0 "Add together the numbers you want: EF_ADDITIVE (32
 set g_keepawayball_trail_color 254     "particle trail color from player/ball"
 set g_keepawayball_damageforcescale    3 "Scale of force which is applied to the ball by weapons/explosions/etc"
 set g_keepawayball_respawntime 10      "if no one picks up the ball, how long to wait until the ball respawns"
-seta g_keepaway_teams_override 0
-set g_keepaway_teams 0
 
 
 // ==========