Revert "SV_Physics(): fix entity cap check in the for loop, plus vkQuake specific improvements for sv_fastpushmove"

This creates infinite spawning edicts, crashing game, as seen in Arcane Dimensions

This reverts commit c4b6120.

Author: vsonnier

Quake/pr_edict.c

@@ -48,17 +48,6 @@ cvar_t saved2 = {"saved2", "0", CVAR_ARCHIVE};
 cvar_t saved3 = {"saved3", "0", CVAR_ARCHIVE};
 cvar_t saved4 = {"saved4", "0", CVAR_ARCHIVE};
 
-//
-static ED_AllocHook_func GLOBAL_ALLOC_HOOK = NULL;
-
-ED_AllocHook_func ED_AllocSetHook (ED_AllocHook_func alloc_hook)
-{
-	ED_AllocHook_func previous = GLOBAL_ALLOC_HOOK;
-	GLOBAL_ALLOC_HOOK = alloc_hook;
-
-	return previous;
-}
-
 /*
 =================
 ED_Alloc
@@ -85,8 +74,9 @@ edict_t *ED_Alloc (void)
 		qcvm->free_list.head_index = (qcvm->free_list.head_index + 1) % MAX_EDICTS;
 		qcvm->free_list.size -= 1;
 
-		if (GLOBAL_ALLOC_HOOK)
-			GLOBAL_ALLOC_HOOK (e);
+		// no real need, but easier for debugging...
+		if (qcvm->free_list.size == 0)
+			qcvm->free_list.head_index = 0;
 
 		return e;
 	}
@@ -106,9 +96,6 @@ edict_t *ED_Alloc (void)
 
 	assert (!e->free);
 
-	if (GLOBAL_ALLOC_HOOK)
-		GLOBAL_ALLOC_HOOK (e);
-
 	return e;
 }
 

Quake/progs.h

@@ -112,12 +112,6 @@ void	 ED_Free (edict_t *ed);
 void	 ED_RemoveFromFreeList (edict_t *ed);
 void	 ED_RebuildFreeList (bool force_free_reuse);
 
-typedef void (*ED_AllocHook_func) (edict_t *allocated_ed);
-
-// register a ED_AllocHook_func that will be called at each ED_Alloc,
-// passing the newly allocated allocated_ed. Returns the previously registered ED_AllocHook.
-ED_AllocHook_func ED_AllocSetHook (ED_AllocHook_func alloc_hook);
-
 void		ED_Print (edict_t *ed);
 void		ED_Write (FILE *f, edict_t *ed);
 const char *ED_ParseEdict (const char *data, edict_t *ent);

Quake/sv_phys.c

@@ -499,7 +499,7 @@ static void SV_PushMove (edict_t *pusher, float movetime)
 	check = NEXT_EDICT (qcvm->edicts);
 
 	while (true)
-	{
+	{		
 		if (e >= (fast_pushers ? num_pushable_ent_cache - 1 : qcvm->num_edicts - 1 - 1))
 			break;
 
@@ -1242,19 +1242,6 @@ static void SV_Physics_Step (edict_t *ent)
 
 //============================================================================
 
-// track ED_Alloc during SV_Physics execution
-static void SV_Physics_Alloc_Hook (edict_t *e)
-{
-	assert (!e->free);
-
-	// track the newly allocated edicts in order to add them into the pushable_ent_cache.
-	// this is OK because by construction free edicts cannot be reused immediatly,
-	// so e is garanteed not to be in pushable_ent_cache already.
-	// since they are just allocated, they have a blank state so we add all of them
-	// to pushable_ent_cache regardless, and the pushable test will be made later on in SV_PushMove in any case.
-	pushable_ent_cache[num_pushable_ent_cache++] = e;
-}
-
 /*
 ================
 SV_Physics
@@ -1265,11 +1252,8 @@ void SV_Physics (void)
 {
 	int		 i;
 	int		 entity_cap; // For sv_freezenonclients
-	int		*pentitycap = NULL;
 	edict_t *ent;
 
-	ED_AllocHook_func previous_alloc_hook = NULL;
-
 	int physics_mode;
 	if (qcvm->extglobals.physics_mode)
 		physics_mode = *qcvm->extglobals.physics_mode;
@@ -1311,16 +1295,9 @@ void SV_Physics (void)
 	ent = qcvm->edicts;
 
 	if (sv_freezenonclients.value && qcvm == &sv.qcvm)
-	{
 		entity_cap = svs.maxclients + 1; // Only run physics on clients and the world
-		// a const during edicts iteration = entity_cap;
-		pentitycap = &entity_cap;
-	}
 	else
-	{
-		// adapts to the actual qcvm->num_edicts possibly raising during edicts iteration itself
-		pentitycap = &qcvm->num_edicts;
-	}
+		entity_cap = qcvm->num_edicts;
 
 	// fill the pushable entities cache
 	if (sv_fastpushmove.value > 0.f)
@@ -1337,12 +1314,10 @@ void SV_Physics (void)
 
 			pushable_ent_cache[num_pushable_ent_cache++] = check;
 		}
-
-		previous_alloc_hook = ED_AllocSetHook (SV_Physics_Alloc_Hook);
 	}
 
 	// for (i=0 ; i<sv.num_edicts ; i++, ent = NEXT_EDICT(ent))
-	for (i = 0; i < *pentitycap; i++, ent = NEXT_EDICT (ent))
+	for (i = 0; i < entity_cap; i++, ent = NEXT_EDICT (ent))
 	{
 		if (ent->free)
 			continue;
@@ -1388,7 +1363,4 @@ void SV_Physics (void)
 
 	if (!(sv_freezenonclients.value && qcvm == &sv.qcvm))
 		qcvm->time += host_frametime;
-
-	if (sv_fastpushmove.value > 0.f)
-		ED_AllocSetHook (previous_alloc_hook);
 }