Merge branch 'master' into Lyberta/KillSound

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator / gamemode_domination.qh

diff --git a/qcsrc/server/mutators/mutator/gamemode_domination.qh b/qcsrc/server/mutators/mutator/gamemode_domination.qh
index 8b4ca399bae9de5a5e0c200d4d934448f9db0b7d..95311c98a36cef9e6183cb63cfc4c341f1fd2ecb 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_domination.qh
+++ b/qcsrc/server/mutators/mutator/gamemode_domination.qh
@@ -14,8 +14,6 @@ REGISTER_MUTATOR(dom, false)
     MUTATOR_STATIC();
        MUTATOR_ONADD
        {
-               dom_Initialize();
-
                int fraglimit_override = autocvar_g_domination_point_limit;
                if (autocvar_g_domination_roundbased && autocvar_g_domination_roundbased_point_limit)
                        fraglimit_override = autocvar_g_domination_roundbased_point_limit;
@@ -23,6 +21,8 @@ REGISTER_MUTATOR(dom, false)
                GameRules_teams(true);
         GameRules_limit_score(fraglimit_override);
         GameRules_limit_lead(autocvar_g_domination_point_leadlimit);
+
+               dom_Initialize();
        }
        return 0;
 }
@@ -32,11 +32,6 @@ const float ST_DOM_TICKS = 1;
 const float ST_DOM_CAPS = 1;
 
 // pps: points per second
-.float dom_total_pps = _STAT(DOM_TOTAL_PPS);
-.float dom_pps_red = _STAT(DOM_PPS_RED);
-.float dom_pps_blue = _STAT(DOM_PPS_BLUE);
-.float dom_pps_yellow = _STAT(DOM_PPS_YELLOW);
-.float dom_pps_pink = _STAT(DOM_PPS_PINK);
 float total_pps;
 float pps_red;
 float pps_blue;