Minor tweaks

bradharding · Feb 8, 2025 · 5090d53 · 5090d53
1 parent 9e1f8e7
commit 5090d53
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/p_inter.c b/src/p_inter.c
@@ -2257,8 +2257,7 @@ void P_DamageMobj(mobj_t *target, mobj_t *inflicter, mobj_t *source, int damage,
     // thus kick away unless using the chainsaw.
     if (massacre)
     {
-        if (r_corpses_moreblood
-            && r_bloodsplats_max
+        if (r_bloodsplats_max
             && !(flags & MF_NOBLOOD) && type != MT_SKULL
             && target->bloodcolor > NOBLOOD)
         {
@@ -2271,7 +2270,9 @@ void P_DamageMobj(mobj_t *target, mobj_t *inflicter, mobj_t *source, int damage,
 
                 target->momx += FixedMul(MASSACRETHRUST, finecosine[ang]);
                 target->momy += FixedMul(MASSACRETHRUST, finesine[ang]);
-                P_SpawnMoreBlood(target);
+
+                if (r_corpses_moreblood)
+                    P_SpawnMoreBlood(target);
             }
         }
     }

diff --git a/src/r_things.c b/src/r_things.c
@@ -1062,8 +1062,8 @@ void R_DrawNearbySprites(void)
         {
             const short lightlevel = sec->lightlevel;
 
-            spritelights = scalelight[BETWEEN(0, (lightlevel >> LIGHTSEGSHIFT) + extralight, LIGHTLEVELS - 1)];
-            nextspritelights = scalelight[BETWEEN(0, ((lightlevel + 4) >> LIGHTSEGSHIFT) + extralight, LIGHTLEVELS - 1)];
+            spritelights = scalelight[BETWEEN(0, ((lightlevel - 2) >> LIGHTSEGSHIFT) + extralight, LIGHTLEVELS - 1)];
+            nextspritelights = scalelight[BETWEEN(0, ((lightlevel + 2) >> LIGHTSEGSHIFT) + extralight, LIGHTLEVELS - 1)];
 
             R_ProjectSprite(thing);
         }