Done requested changes

fabiangreffrath · Sep 4, 2024 · 9af96d5 · 9af96d5
1 parent 872d4de
commit 9af96d5
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 54 deletions.
diff --git a/src/doom/m_crispy.c b/src/doom/m_crispy.c
@@ -25,7 +25,6 @@
 #include "s_sound.h"
 #include "r_defs.h" // [crispy] laserpatch
 #include "r_sky.h" // [crispy] R_InitSkyMap()
-#include "z_zone.h" // [crispy] Z_Free()
 
 #include "m_crispy.h"
 
@@ -518,14 +517,7 @@ static void M_CrispyToggleSmoothLightingHook (void)
     crispy->smoothlight = !crispy->smoothlight;
 
 #ifdef CRISPY_TRUECOLOR
-    // [crispy] zero out colormaps[] array so it can be
-    // reallocated and recalculated in R_InitColormaps()
-    if (colormaps != NULL)
-    {
-        Z_Free(colormaps);
-        colormaps = NULL;
-    }
-    // [crispy] re-calculate light tables and amount of colormaps
+    // [crispy] re-calculate amount of colormaps and light tables
     R_InitColormaps();
 #endif
     // [crispy] re-calculate the zlight[][] array

diff --git a/src/doom/p_user.c b/src/doom/p_user.c
@@ -34,12 +34,8 @@
 
 
 // Index of the special effects (INVUL inverse) map.
-#ifndef CRISPY_TRUECOLOR
-#define INVERSECOLORMAP		32
-#else
-// [crispy] parameterized for smooth diminishing lighting
-int INVERSECOLORMAP;
-#endif
+// [crispy] moved to r_main.h for smooth diminishing lighting parameterization
+//#define INVERSECOLORMAP		NUMCOLORMAPS
 
 
 //

diff --git a/src/doom/r_data.c b/src/doom/r_data.c
@@ -1207,10 +1207,18 @@ void R_InitColormaps (void)
 	{
 		NUMCOLORMAPS = 32;
 	}
-	// [crispy] Regardless of the number of color maps,
+	// [crispy] Regardless of the number of colormaps,
 	// invulnerability is always the last one.
 	INVERSECOLORMAP = NUMCOLORMAPS;
 
+	// [crispy] zero out colormaps[] array so it can be
+	// reallocated and recalculated with different amount of colormaps
+	if (colormaps != NULL)
+	{
+		Z_Free(colormaps);
+		colormaps = NULL;
+	}
+
 	if (!colormaps)
 	{
 		colormaps = (lighttable_t*) Z_Malloc((NUMCOLORMAPS + 1) * 256 * sizeof(lighttable_t), PU_STATIC, 0);

diff --git a/src/doom/r_main.c b/src/doom/r_main.c
@@ -111,9 +111,7 @@ lighttable_t***		zlight = NULL;
 int			extralight;			
 
 // [crispy] parameterized for smooth diminishing lighting
-#ifdef CRISPY_TRUECOLOR
 int NUMCOLORMAPS;
-#endif
 int LIGHTLEVELS;
 int LIGHTSEGSHIFT;
 int LIGHTBRIGHT;
@@ -702,41 +700,36 @@ void R_InitLightTables (void)
    // [crispy] smooth diminishing lighting
     if (crispy->smoothlight)
     {
-#ifndef CRISPY_TRUECOLOR
-		LIGHTLEVELS = 32;
-		LIGHTSEGSHIFT = 3;
-		LIGHTBRIGHT = 2;
-		MAXLIGHTSCALE = 48;
-		LIGHTSCALESHIFT = 12;
-		MAXLIGHTZ = 1024;
-		LIGHTZSHIFT = 17;
-#else
-		if (crispy->truecolor)
-		{
-		// [crispy] if in TrueColor mode, use smoothest diminished lighting
-		LIGHTLEVELS = 256;
-		LIGHTSEGSHIFT = 0;
-		LIGHTBRIGHT = 15;
-		MAXLIGHTSCALE = 376;
-		LIGHTSCALESHIFT = 9;
-		MAXLIGHTZ = 1024;
-		LIGHTZSHIFT = 17;
-		}
-		else
-		{
-		// [crispy] else, use paletted paletted approach
-		LIGHTLEVELS = 32;
-		LIGHTSEGSHIFT = 3;
-		LIGHTBRIGHT = 2;
-		MAXLIGHTSCALE = 48;
-		LIGHTSCALESHIFT = 12;
-		MAXLIGHTZ = 1024;
-		LIGHTZSHIFT = 17;
-		}
+#ifdef CRISPY_TRUECOLOR
+    if (crispy->truecolor)
+    {
+	    // [crispy] if in TrueColor mode, use smoothest diminished lighting
+	    NUMCOLORMAPS = 256;
+	    LIGHTLEVELS = 256;
+	    LIGHTSEGSHIFT = 0;
+	    LIGHTBRIGHT = 15;
+	    MAXLIGHTSCALE = 376;
+	    LIGHTSCALESHIFT = 9;
+	    MAXLIGHTZ = 1024;
+	    LIGHTZSHIFT = 17;
+    }
+    else
 #endif
+    {
+	    // [crispy] else, use paletted approach
+	    NUMCOLORMAPS = 32;
+	    LIGHTLEVELS = 32;
+	    LIGHTSEGSHIFT = 3;
+	    LIGHTBRIGHT = 2;
+	    MAXLIGHTSCALE = 48;
+	    LIGHTSCALESHIFT = 12;
+	    MAXLIGHTZ = 1024;
+	    LIGHTZSHIFT = 17;
+    }
     }
     else
     {
+	NUMCOLORMAPS = 32;
 	LIGHTLEVELS = 16;
 	LIGHTSEGSHIFT = 4;
 	LIGHTBRIGHT = 1;

diff --git a/src/doom/r_main.h b/src/doom/r_main.h
@@ -80,13 +80,11 @@ extern lighttable_t*	fixedcolormap;
 
 // Number of diminishing brightness levels.
 // There a 0-31, i.e. 32 LUT in the COLORMAP lump.
-#ifndef CRISPY_TRUECOLOR
-#define NUMCOLORMAPS		32
-#else
 // [crispy] parameterized for smooth diminishing lighting
 extern int NUMCOLORMAPS;
-extern int INVERSECOLORMAP;
-#endif
+// [crispy] index of the special effects (INVUL inverse) map,
+// parameterized for smooth diminishing lighting
+#define INVERSECOLORMAP		NUMCOLORMAPS
 
 // Blocky/low detail mode.
 //B remove this?