File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -69,8 +69,8 @@ class CCSGameRules : public CGameRules
6969 SCHEMA_FIELD (int , m_nEndMatchMapVoteWinner)
7070 SCHEMA_FIELD (int , m_iRoundTime)
7171 SCHEMA_FIELD (bool , m_bFreezePeriod)
72- SCHEMA_FIELD_POINTER (CUtlVector<SpawnPoint* >, m_CTSpawnPoints)
73- SCHEMA_FIELD_POINTER (CUtlVector<SpawnPoint* >, m_TerroristSpawnPoints)
72+ SCHEMA_FIELD_POINTER (CUtlVector<CHandle< SpawnPoint> >, m_CTSpawnPoints)
73+ SCHEMA_FIELD_POINTER (CUtlVector<CHandle< SpawnPoint> >, m_TerroristSpawnPoints)
7474 SCHEMA_FIELD (int , m_iMaxNumTerrorists)
7575 SCHEMA_FIELD (int , m_iMaxNumCTs)
7676 SCHEMA_FIELD (bool , m_bGameRestart)
Original file line number Diff line number Diff line change 1- /* *
1+ /* *
22 * =============================================================================
33 * CS2Fixes
44 * Copyright (C) 2023-2025 Source2ZE
@@ -1154,14 +1154,24 @@ std::vector<SpawnPoint*> ZR_GetSpawns()
11541154 if (!g_pGameRules)
11551155 return spawns;
11561156
1157- CUtlVector<SpawnPoint*>* ctSpawns = g_pGameRules->m_CTSpawnPoints ();
1158- CUtlVector<SpawnPoint*>* tSpawns = g_pGameRules->m_TerroristSpawnPoints ();
1157+ auto ctSpawns = g_pGameRules->m_CTSpawnPoints ();
1158+ auto tSpawns = g_pGameRules->m_TerroristSpawnPoints ();
11591159
11601160 FOR_EACH_VEC (*ctSpawns, i)
1161- spawns.push_back ((*ctSpawns)[i]);
1161+ {
1162+ SpawnPoint* pSpawn = (*ctSpawns)[i].Get ();
1163+
1164+ if (pSpawn)
1165+ spawns.push_back (pSpawn);
1166+ }
11621167
11631168 FOR_EACH_VEC (*tSpawns, i)
1164- spawns.push_back ((*tSpawns)[i]);
1169+ {
1170+ SpawnPoint* pSpawn = (*tSpawns)[i].Get ();
1171+
1172+ if (pSpawn)
1173+ spawns.push_back (pSpawn);
1174+ }
11651175
11661176 if (!spawns.size ())
11671177 Panic (" There are no spawns!\n " );
You can’t perform that action at this time.
0 commit comments