Remove linked list from particles

RicardoLuis0 · Sep 18, 2023 · 6fc4767 · 6fc4767
1 parent cfe30c1
commit 6fc4767
Show file tree

Hide file tree

Showing 7 changed files with 142 additions and 161 deletions.
diff --git a/src/g_cvars.cpp b/src/g_cvars.cpp
@@ -126,10 +126,10 @@ CUSTOM_CVAR(Int, r_maxparticles, 4000, CVAR_ARCHIVE | CVAR_NOINITCALL)
 {
 	if (self == 0)
 		self = 4000;
-	else if (self > 65535)
-		self = 65535;
-	else if (self < 100)
-		self = 100;
+	else if (self > ABSOLUTE_MAX_PARTICLES)
+		self = ABSOLUTE_MAX_PARTICLES;
+	else if (self < ABSOLUTE_MIN_PARTICLES)
+		self = ABSOLUTE_MIN_PARTICLES;
 
 	if (gamestate != GS_STARTUP)
 	{

diff --git a/src/g_levellocals.h b/src/g_levellocals.h
@@ -654,11 +654,10 @@ struct FLevelLocals
 	DSeqNode *SequenceListHead;
 
 	// [RH] particle globals
-	uint32_t			OldestParticle; // [MC] Oldest particle for replacing with PS_REPLACE
-	uint32_t			ActiveParticles;
-	uint32_t			InactiveParticles;
+
 	TArray<particle_t>	Particles;
-	TArray<uint16_t>	ParticlesInSubsec;
+	TArray<particle_t>	ReplaceableParticles;
+
 	FThinkerCollection Thinkers;
 
 	TArray<DVector2>	Scrolls;		// NULL if no DScrollers in this level

diff --git a/src/gamedata/r_defs.h b/src/gamedata/r_defs.h
@@ -1644,6 +1644,8 @@ struct subsector_t
 	FPortalCoverage	portalcoverage[2];
 
 	LightmapSurface *lightmap[2];
+
+	TArray<uint32_t> particles;
 };