Merge branch 'master' into z411/bai-server

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / gamemodes / gamemode / tdm / sv_tdm.qc

diff --git a/qcsrc/common/gamemodes/gamemode/tdm/sv_tdm.qc b/qcsrc/common/gamemodes/gamemode/tdm/sv_tdm.qc
index 43a993844759db4caf390cabdf217b4b6a12a33f..3bd9cb5648bad21295a2aa7ecc0e3b11251d878f 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/tdm/sv_tdm.qc
+++ b/qcsrc/common/gamemodes/gamemode/tdm/sv_tdm.qc
@@ -14,7 +14,6 @@ spawnfunc(tdm_team)
 {
        if(!g_tdm || !this.cnt) { delete(this); return; }
 
-       this.classname = "tdm_team";
        this.team = this.cnt + 1;
 }
 
@@ -51,6 +50,16 @@ void tdm_DelayedInit(entity this)
        }
 }
 
+void tdm_Initialize()
+{
+       GameRules_teams(true);
+       GameRules_spawning_teams(autocvar_g_tdm_team_spawns);
+       GameRules_limit_score(autocvar_g_tdm_point_limit);
+       GameRules_limit_lead(autocvar_g_tdm_point_leadlimit);
+
+       InitializeEntity(NULL, tdm_DelayedInit, INITPRIO_GAMETYPE);
+}
+
 MUTATOR_HOOKFUNCTION(tdm, TeamBalance_CheckAllowedTeams, CBC_ORDER_EXCLUSIVE)
 {
        M_ARGV(1, string) = "tdm_team";
@@ -61,3 +70,9 @@ MUTATOR_HOOKFUNCTION(tdm, Scores_CountFragsRemaining)
        // announce remaining frags
        return true;
 }
+
+MUTATOR_HOOKFUNCTION(tdm, Scores_AnnounceLeads)
+{
+       // enable leads announcer
+       return true;
+}