UTIL_ResetEntities: Crash fixed, sometimes returns NULL for 1 index

s1lentq · s1lentq · commit 10813019c82b · 2022-06-14T19:31:34.000+07:00
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);

Original file line number	Diff line number	Diff line change
`@@ -1502,10 +1502,10 @@ void UTIL_RestartOther(const char *szClassname)`
`1502`	`1502`
`1503`	`1503`	`void UTIL_ResetEntities()`
`1504`	`1504`	`{`
`1505`		`- edict_t *pEdict = INDEXENT(1);`
`1506`		`- for (int i = 1; i < gpGlobals->maxEntities; i++, pEdict++)`
	`1505`	`+ for (int i = 1; i < gpGlobals->maxEntities; i++)`
`1507`	`1506`	`{`
`1508`		`- if (pEdict->free)`
	`1507`	`+ edict_t *pEdict = INDEXENT(i);`
	`1508`	`+ if (!pEdict \|\| pEdict->free)`
`1509`	`1509`	`continue;`
`1510`	`1510`
`1511`	`1511`	`CBaseEntity *pEntity = CBaseEntity::Instance(pEdict);`