UTIL_ResetEntities: Crash fixed, sometimes returns NULL for 1 index

s1lentq · Jun 14, 2022 · 1081301 · 1081301
1 parent 21dab90
commit 1081301
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/regamedll/dlls/util.cpp b/regamedll/dlls/util.cpp
@@ -1502,10 +1502,10 @@ void UTIL_RestartOther(const char *szClassname)
 
 void UTIL_ResetEntities()
 {
-	edict_t *pEdict = INDEXENT(1);
-	for (int i = 1; i < gpGlobals->maxEntities; i++, pEdict++)
+	for (int i = 1; i < gpGlobals->maxEntities; i++)
 	{
-		if (pEdict->free)
+		edict_t *pEdict = INDEXENT(i);
+		if (!pEdict || pEdict->free)
 			continue;
 
 		CBaseEntity *pEntity = CBaseEntity::Instance(pEdict);