Merge breaking changes for 0.8.5 into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / gamemodes / gamemode / invasion / sv_invasion.qh

diff --git a/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qh b/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qh
index 3c16e34e18dea1b1179760cadb65aea08c3a0ce9..9d01851a93bddce830da24f10994d66ced731d24 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qh
+++ b/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qh
@@ -2,9 +2,7 @@
 
 #include <common/mutators/base.qh>
 #define autocvar_g_invasion_point_limit cvar("g_invasion_point_limit")
-int autocvar_g_invasion_teams;
 int autocvar_g_invasion_type;
-bool autocvar_g_invasion_team_spawns;
 bool g_invasion;
 IntrusiveList g_invasion_roundends;
 IntrusiveList g_invasion_waves;
@@ -19,10 +17,6 @@ REGISTER_MUTATOR(inv, false)
                g_invasion_roundends = IL_NEW();
                g_invasion_waves = IL_NEW();
                g_invasion_spawns = IL_NEW();
-               if (autocvar_g_invasion_teams >= 2) {
-                       GameRules_teams(true);
-                       GameRules_spawning_teams(autocvar_g_invasion_team_spawns);
-               }
         GameRules_limit_score(autocvar_g_invasion_point_limit);
 
                g_invasion = true;
@@ -32,21 +26,16 @@ REGISTER_MUTATOR(inv, false)
        return 0;
 }
 
-float inv_numspawned;
-float inv_maxspawned;
-float inv_roundcnt;
-float inv_maxrounds;
-float inv_numkilled;
+int inv_numspawned;
+int inv_maxspawned;
+int inv_roundcnt;
+int inv_maxrounds;
+int inv_numkilled;
 float inv_lastcheck;
-float inv_maxcurrent;
-
-float invasion_teams;
-float inv_monsters_perteam[17];
+int inv_maxcurrent;
 
 float inv_monsterskill;
 
-const float ST_INV_KILLS = 1;
-
 const int INV_TYPE_ROUND = 0; // round-based waves of enemies
 const int INV_TYPE_HUNT = 1; // clear the map of placed enemies
 const int INV_TYPE_STAGE = 2; // reach the end of the level