Merge branch 'master' into terencehill/lms_updates

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / gamemodes / gamemode / clanarena / sv_clanarena.qh

diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qh b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qh
index f1fc645094c7c7de36b29a9d9e21a92c08a69d0b..869860f7dc258cec43c0e5d6b666aabb16f0323d 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qh
+++ b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qh
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <common/mutators/base.qh>
+#include <server/elimination.qh>
 #include <server/round_handler.qh>
-#include <server/miscfunctions.qh>
 #include <server/command/sv_cmd.qh>
 
 int autocvar_g_ca_point_limit;
@@ -12,7 +12,7 @@ bool autocvar_g_ca_team_spawns;
 //int autocvar_g_ca_teams;
 int autocvar_g_ca_teams_override;
 float autocvar_g_ca_warmup;
-string autocvar_g_ca_weaponarena;
+string autocvar_g_ca_weaponarena = "most";
 
 
 int ca_teams;