Variable cleanup

kraflab · Dec 7, 2024 · a5b30b4 · a5b30b4
1 parent bfb2739
commit a5b30b4
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 14 deletions.
diff --git a/prboom2/src/am_map.c b/prboom2/src/am_map.c
@@ -2801,7 +2801,7 @@ void AM_Drawer (dboolean minimap)
   if (!automap_overlay) // cph - If not overlay mode, clear background for the automap
     V_FillRect(FB, f_x, f_y, f_w, f_h, (byte)mapcolor_p->back); //jff 1/5/98 background default color
   if (automap_overlay == 2 && !M_MenuIsShaded())
-    V_DrawShaded(FB, f_x, f_y, f_w, f_h, screenshade);
+    V_DrawShaded(FB, f_x, f_y, f_w, f_h, FULLSHADE);
 
   if (map_textured)
   {

diff --git a/prboom2/src/gl_main.c b/prboom2/src/gl_main.c
@@ -848,7 +848,7 @@ void gld_FillBlock(int x, int y, int width, int height, int col)
   glsl_PopNullShader();
 }
 
-void gld_DrawShaded(int x, int y, int width, int height, int screenshade)
+void gld_DrawShaded(int x, int y, int width, int height, int shade)
 {
   color_rgb_t color = gld_LookupIndexedColor(playpal_black, V_IsAutomapLightmodeIndexed());
 
@@ -859,7 +859,7 @@ void gld_DrawShaded(int x, int y, int width, int height, int screenshade)
   glColor4f((float)color.r/255.0f,
             (float)color.g/255.0f,
             (float)color.b/255.0f,
-            (float)screenshade/30);
+            (float)shade/30);
 
   glBegin(GL_TRIANGLE_STRIP);
     glVertex2i( x, y );

diff --git a/prboom2/src/gl_struct.h b/prboom2/src/gl_struct.h
@@ -92,7 +92,7 @@ void gld_DrawLine(int x0, int y0, int x1, int y1, int BaseColor);
 void gld_DrawLine_f(float x0, float y0, float x1, float y1, int BaseColor);
 void gld_DrawWeapon(int weaponlump, vissprite_t *vis, int lightlevel);
 void gld_FillBlock(int x, int y, int width, int height, int col);
-void gld_DrawShaded(int x, int y, int width, int height, int screenshade);
+void gld_DrawShaded(int x, int y, int width, int height, int shade);
 void gld_SetPalette(int palette);
 unsigned char *gld_ReadScreen(void);
 

diff --git a/prboom2/src/m_menu.c b/prboom2/src/m_menu.c
@@ -5835,8 +5835,6 @@ void M_StartControlPanel (void)
 //
 // This displays a dark overlay under certain screens of the menus
 
-int screenshade = 20;
-
 dboolean fadeBG(void)
 {
   return dsda_IntConfig(dsda_config_menu_background) == 1;
@@ -5850,7 +5848,7 @@ dboolean M_MenuIsShaded(void)
 
 static void M_ShadedScreen(int scrn)
 {
-  V_DrawShaded(scrn, 0, 0, SCREENWIDTH, SCREENHEIGHT, screenshade);
+  V_DrawShaded(scrn, 0, 0, SCREENWIDTH, SCREENHEIGHT, FULLSHADE);
 }
 
 //

diff --git a/prboom2/src/m_menu.h b/prboom2/src/m_menu.h
@@ -51,7 +51,7 @@ dboolean M_Responder (event_t *ev);
 
 dboolean fadeBG(void);
 dboolean M_MenuIsShaded(void);
-extern int screenshade;
+#define FULLSHADE 20
 
 // Called by main loop,
 // only used for menu (skull cursor) animation.

diff --git a/prboom2/src/v_video.c b/prboom2/src/v_video.c
@@ -624,7 +624,7 @@ static void V_DrawMemPatch(int x, int y, int scrn, const rpatch_t *patch,
 // This uses a dark colormap to create
 // a dark faded background under menus.
 //
-static void FUNC_V_DrawShaded(int scrn, int x, int y, int width, int height, int screenshade)
+static void FUNC_V_DrawShaded(int scrn, int x, int y, int width, int height, int shade)
 {
   extern const lighttable_t **colormaps;
   byte* dest;
@@ -636,7 +636,7 @@ static void FUNC_V_DrawShaded(int scrn, int x, int y, int width, int height, int
 
     for (ix = x; ix < x + width; ++ix)
     {
-      *dest = colormaps[scrn][screenshade * 256 + dest[scrn]];
+      *dest = colormaps[scrn][shade * 256 + dest[scrn]];
       dest++;
     }
   }
@@ -770,9 +770,9 @@ static void WRAP_gld_DrawLine(fline_t* fl, int color)
 {
   gld_DrawLine_f(fl->a.fx, fl->a.fy, fl->b.fx, fl->b.fy, color);
 }
-static void WRAP_gld_DrawShaded(int scrn, int x, int y, int width, int height, int screenshade)
+static void WRAP_gld_DrawShaded(int scrn, int x, int y, int width, int height, int shade)
 {
-  gld_DrawShaded(x, y, width, height, screenshade);
+  gld_DrawShaded(x, y, width, height, shade);
 }
 
 static void NULL_BeginUIDraw(void) {}
@@ -790,7 +790,7 @@ static void NULL_PlotPixel(int scrn, int x, int y, byte color) {}
 static void NULL_PlotPixelWu(int scrn, int x, int y, byte color, int weight) {}
 static void NULL_DrawLine(fline_t* fl, int color) {}
 static void NULL_DrawLineWu(fline_t* fl, int color) {}
-static void NULL_DrawShaded(int scrn, int x, int y, int width, int height, int screenshade) {}
+static void NULL_DrawShaded(int scrn, int x, int y, int width, int height, int shade) {}
 
 static video_mode_t current_videomode = VID_MODESW;
 

diff --git a/prboom2/src/v_video.h b/prboom2/src/v_video.h
@@ -223,7 +223,7 @@ extern V_FillPatch_f V_FillPatch;
 typedef void (*V_DrawBackground_f)(const char* flatname, int scrn);
 extern V_DrawBackground_f V_DrawBackground;
 
-typedef void (*V_DrawShaded_f)(int scrn, int x, int y, int width, int height, int screenshade);
+typedef void (*V_DrawShaded_f)(int scrn, int x, int y, int width, int height, int shade);
 extern V_DrawShaded_f V_DrawShaded;
 
 // CPhipps - function to set the palette to palette number pal.