Externalize R_InitColormaps and R_SetUnderwaterPalette

Not sure if R_SetUnderwaterPalette needed to be guarded by a macro in header file, but probably this will make sence for better understanding about the nature of this function, i.e. it's "for true color only".
fabiangreffrath · Nov 28, 2023 · 772f346 · 772f346
1 parent b15db45
commit 772f346
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/src/heretic/f_finale.c b/src/heretic/f_finale.c
@@ -357,10 +357,7 @@ void F_DrawUnderwater(void)
                 I_SetPalette(palette);
                 W_ReleaseLumpName(lumpname);
 #else
-                {
-                extern void R_SetUnderwaterPalette(void);
                 R_SetUnderwaterPalette();
-                }
 #endif
                 V_DrawFullscreenRawOrPatch(W_GetNumForName(DEH_String("E2END")));
             }
@@ -378,10 +375,7 @@ void F_DrawUnderwater(void)
                 I_SetPalette(palette);
                 W_ReleaseLumpName(lumpname);
 #else
-                {
-                extern void R_InitColormaps(void);
                 R_InitColormaps();
-                }
 #endif
                 underwawa = false;
             }

diff --git a/src/heretic/mn_menu.c b/src/heretic/mn_menu.c
@@ -2035,13 +2035,10 @@ boolean MN_Responder(event_t * event)
 #ifndef CRISPY_TRUECOLOR
             I_SetPalette((byte *) W_CacheLumpName("PLAYPAL", PU_CACHE));
 #else
-            {
-            extern void R_InitColormaps (void);
             I_SetPalette(0);
             R_InitColormaps();
             BorderNeedRefresh = true;
             SB_state = -1;
-            }
 #endif
             return true;
         }

diff --git a/src/heretic/r_local.h b/src/heretic/r_local.h
@@ -462,6 +462,10 @@ byte *R_GetColumn(int tex, int col);
 void R_InitData(void);
 void R_PrecacheLevel(void);
 
+extern void R_InitColormaps(void);
+#ifdef CRISPY_TRUECOLOR
+extern void R_SetUnderwaterPalette(void);
+#endif
 
 //
 // R_things.c