Spawn g_team_entities only if teamplay is enabled

diff --git a/qcsrc/common/gamemodes/sv_rules.qc b/qcsrc/common/gamemodes/sv_rules.qc
index a4a4bcd196deb0ac37eb3dad58e807a980908b89..8a86ad7ca79ba66a7959946678fbc6cf09ed01ad 100644 (file)
--- a/qcsrc/common/gamemodes/sv_rules.qc
+++ b/qcsrc/common/gamemodes/sv_rules.qc
@@ -8,6 +8,7 @@ void GameRules_teams(bool value)
         serverflags |= SERVERFLAG_TEAMPLAY;
         teamplay = 1;
         cvar_set("teamplay", "2");  // DP needs this for sending proper getstatus replies.
+        Team_InitTeams();
         GameRules_spawning_teams(true);
     } else {
        serverflags &= ~SERVERFLAG_TEAMPLAY;

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index ff9438e76d84b205679a05982d5b8bc1eb0b57f3..2839817657262724b38ea8d086b53052fd1ca79a 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -46,7 +46,7 @@ string autocvar_g_forced_team_pink;
 
 entity g_team_entities[NUM_TEAMS]; ///< Holds global team entities.
 
-STATIC_INIT(g_team_entities)
+void Team_InitTeams()
 {
        for (int i = 0; i < NUM_TEAMS; ++i)
        {

diff --git a/qcsrc/server/teamplay.qh b/qcsrc/server/teamplay.qh
index 33f9d02d7e6b01da87c6dd86e6217b3ab546aa95..2774e4a8328155cecfb6ae6f2dcfa04aef56b57c 100644 (file)
--- a/qcsrc/server/teamplay.qh
+++ b/qcsrc/server/teamplay.qh
@@ -12,6 +12,8 @@ bool lockteams;
 
 // ========================== Global teams API ================================
 
+void Team_InitTeams();
+
 /// \brief Returns the global team entity at the given index.
 /// \param[in] index Index of the team.
 /// \return Global team entity at the given index.