Do not check if gamma levels was generated previously

fabiangreffrath · Dec 11, 2023 · c51afc8 · c51afc8
1 parent 5e6d006
commit c51afc8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/src/doom/r_data.c b/src/doom/r_data.c
@@ -1173,9 +1173,6 @@ void R_InitColormaps (void)
 	int c, i, j = 0;
 	byte r, g, b;
 
-	// [crispy] intermediate gamma levels
-	I_SetGammaTable();
-
 	playpal = W_CacheLumpName("PLAYPAL", PU_STATIC);
 
 	if (!colormaps)
@@ -1298,6 +1295,10 @@ void R_InitData (void)
     printf (".");
     R_InitSpriteLumps ();
     printf (".");
+#ifdef CRISPY_TRUECOLOR
+    // [crispy] Initialize and generate gamma-correction levels for true color render.
+    I_SetGammaTable ();
+#endif
     R_InitColormaps ();
 #ifndef CRISPY_TRUECOLOR
     R_InitTranMap(); // [crispy] prints a mark itself

diff --git a/src/heretic/r_data.c b/src/heretic/r_data.c
@@ -535,9 +535,6 @@ void R_InitColormaps(void)
 	int c, i, j = 0;
 	byte r, g, b;
 
-	// [crispy] intermediate gamma levels
-	I_SetGammaTable();
-
 	playpal = W_CacheLumpName("PLAYPAL", PU_STATIC);
 
 	if (!colormaps)
@@ -665,6 +662,10 @@ void R_InitData(void)
     R_InitSpriteLumps();
     IncThermo();
     printf (".");
+#ifdef CRISPY_TRUECOLOR
+    // [crispy] Initialize and generate gamma-correction levels for true color render.
+    I_SetGammaTable();
+#endif
     R_InitColormaps();
 }
 

diff --git a/src/i_video.c b/src/i_video.c
@@ -986,14 +986,6 @@ void I_SetGammaTable (void)
 void I_SetPalette (byte *doompalette)
 {
     int i;
-    static boolean gamma2table_set = false;
-
-    // [crispy] intermediate gamma levels
-    if (!gamma2table_set)
-    {
-        I_SetGammaTable();
-        gamma2table_set = true;
-    }
 
     for (i=0; i<256; ++i)
     {
@@ -1756,6 +1748,10 @@ void I_InitGraphics(void)
 
     SDL_FillRect(screenbuffer, NULL, 0);
 
+    // [crispy] Initialize and generate gamma-correction levels for palletted render.
+
+    I_SetGammaTable();
+
     // Set the palette
 
     doompal = W_CacheLumpName(DEH_String("PLAYPAL"), PU_CACHE);