Dynamically find number of blood splat lumps

bradharding · Jan 9, 2025 · 3a537da · 3a537da
1 parent 422bfc5
commit 3a537da
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/src/p_mobj.c b/src/p_mobj.c
@@ -1606,7 +1606,7 @@ void P_SpawnBloodSplat(const fixed_t x, const fixed_t y, const int color, const
 
             if (splat)
             {
-                const int   patch = firstbloodsplatlump + (M_BigRandom() & (BLOODSPLATLUMPS - 1));
+                const int   patch = firstbloodsplatlump + (M_BigRandom() & (numbloodsplatlumps - 1));
 
                 splat->patch = firstspritelump + patch;
                 splat->color = color;

diff --git a/src/p_mobj.h b/src/p_mobj.h
@@ -45,7 +45,6 @@
 #define REDBLOODSPLATCOLOR    184
 #define GREENBLOODSPLATCOLOR  122
 
-#define BLOODSPLATLUMPS        12
 #define CORPSEBLOODSPLATS     512
 
 // killough 11/98:

diff --git a/src/p_saveg.c b/src/p_saveg.c
@@ -1401,8 +1401,8 @@ void P_UnarchiveThinkers(void)
 
                     if (r_bloodsplats_total < r_bloodsplats_max)
                     {
-                        if (splat->patch < firstbloodsplatlump || splat->patch >= firstbloodsplatlump + BLOODSPLATLUMPS)
-                            splat->patch = firstbloodsplatlump + (M_BigRandom() & (BLOODSPLATLUMPS - 1));
+                        if (splat->patch < firstbloodsplatlump || splat->patch >= firstbloodsplatlump + numbloodsplatlumps)
+                            splat->patch = firstbloodsplatlump + (M_BigRandom() & (numbloodsplatlumps - 1));
 
                         splat->width = spritewidth[splat->patch];
                         splat->patch += firstspritelump;

diff --git a/src/r_things.c b/src/r_things.c
@@ -98,6 +98,7 @@ static int                      clipbot[MAXWIDTH];
 spritedef_t                     *sprites;
 
 short                           firstbloodsplatlump;
+int                             numbloodsplatlumps;
 
 bool                            allowwolfensteinss = true;
 
@@ -322,6 +323,7 @@ static void R_InitSpriteDefs(void)
     free(hash); // free hash table
 
     firstbloodsplatlump = sprites[SPR_BLD2].spriteframes[0].lump[0];
+    numbloodsplatlumps = sprites[SPR_BLD2].numframes;
 
     // check if Wolfenstein SS sprites have been changed to zombiemen sprites
     if (bfgedition && gamemode == commercial)

diff --git a/src/r_things.h b/src/r_things.h
@@ -50,6 +50,7 @@ extern fixed_t  pspritescale;
 extern fixed_t  pspriteiscale;
 
 extern short    firstbloodsplatlump;
+extern int      numbloodsplatlumps;
 
 extern bool     allowwolfensteinss;