Skip to content

Commit 6be7294

Browse files
committed
Update spawnpoint vector types for 2026-01-23 optional CS2 update
1 parent 38a3f25 commit 6be7294

2 files changed

Lines changed: 17 additions & 7 deletions

File tree

src/cs2_sdk/entity/cgamerules.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff 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)

src/zombiereborn.cpp

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
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");

0 commit comments

Comments
 (0)