Make Draw_GetPicSize() take HUD scaling into account.

Author: kondrak

client/cl_scrn.c

@@ -466,7 +466,7 @@ void SCR_DrawPause (void)
 		return;
 
 	re.DrawGetPicSize (&w, &h, "pause");
-	re.DrawPic ((viddef.width-w*vid_hudscale->value)/2, viddef.height/2 + 8*vid_hudscale->value, "pause");
+	re.DrawPic ((viddef.width-w)/2, viddef.height/2 + 8*vid_hudscale->value, "pause");
 }
 
 /*
@@ -483,7 +483,7 @@ void SCR_DrawLoading (void)
 
 	scr_draw_loading = false;
 	re.DrawGetPicSize (&w, &h, "loading");
-	re.DrawPic ((viddef.width-w*vid_hudscale->value)/2, (viddef.height-h*vid_hudscale->value)/2, "loading");
+	re.DrawPic ((viddef.width-w)/2, (viddef.height-h)/2, "loading");
 }
 
 //=============================================================================

client/cl_view.c

@@ -430,8 +430,8 @@ void SCR_DrawCrosshair (void)
 	if (!crosshair_pic[0])
 		return;
 
-	re.DrawPic (scr_vrect.x + ((int)(scr_vrect.width - crosshair_width * vid_hudscale->value)>>1)
-	, scr_vrect.y + ((int)(scr_vrect.height - crosshair_height * vid_hudscale->value)>>1), crosshair_pic);
+	re.DrawPic (scr_vrect.x + ((scr_vrect.width - crosshair_width)>>1)
+	, scr_vrect.y + ((scr_vrect.height - crosshair_height)>>1), crosshair_pic);
 }
 
 /*

client/menu.c

@@ -83,7 +83,7 @@ static void M_Banner( char *name )
 	int w, h;
 
 	re.DrawGetPicSize (&w, &h, name );
-	re.DrawPic( viddef.width / 2 - w * vid_hudscale->value / 2, viddef.height / 2 - 110 * vid_hudscale->value, name );
+	re.DrawPic( viddef.width / 2 - w / 2, viddef.height / 2 - 110 * vid_hudscale->value, name );
 }
 
 void M_PushMenu ( void (*draw) (void), const char *(*key) (int k) )
@@ -411,9 +411,6 @@ void M_Main_Draw (void)
 	{
 		re.DrawGetPicSize( &w, &h, names[i] );
 
-		w *= vid_hudscale->value;
-		h *= vid_hudscale->value;
-
 		if ( w > widest )
 			widest = w;
 		totalheight += ( h + 12 );
@@ -434,9 +431,9 @@ void M_Main_Draw (void)
 	M_DrawCursor( xoffset - 25 * vid_hudscale->value, ystart + (m_main_cursor * 40 + 11)*vid_hudscale->value, (int)(cls.realtime / 100)%NUM_CURSOR_FRAMES );
 
 	re.DrawGetPicSize( &w, &h, "m_main_plaque" );
-	re.DrawPic( xoffset - 30 * vid_hudscale->value - w * vid_hudscale->value, ystart, "m_main_plaque" );
+	re.DrawPic( xoffset - 30 * vid_hudscale->value - w, ystart, "m_main_plaque" );
 
-	re.DrawPic( xoffset - 30 * vid_hudscale->value - w * vid_hudscale->value, ystart + (h + 5)*vid_hudscale->value, "m_main_logo" );
+	re.DrawPic( xoffset - 30 * vid_hudscale->value - w, ystart + h + 5*vid_hudscale->value, "m_main_logo" );
 }
 
 
@@ -3951,7 +3948,7 @@ void M_Quit_Draw (void)
 	int		w, h;
 
 	re.DrawGetPicSize (&w, &h, "quit");
-	re.DrawPic ( (viddef.width-w*vid_hudscale->value)/2, (viddef.height-h*vid_hudscale->value)/2, "quit");
+	re.DrawPic ( (viddef.width-w)/2, (viddef.height-h)/2, "quit");
 }
 
 

ref_vk/vk_draw.c

@@ -115,8 +115,11 @@ void Draw_GetPicSize (int *w, int *h, char *pic)
 		*w = *h = -1;
 		return;
 	}
-	*w = vk->width;
-	*h = vk->height;
+
+	cvar_t *scale = ri.Cvar_Get("hudscale", "1", 0);
+
+	*w = vk->width * scale->value;
+	*h = vk->height * scale->value;
 }
 
 /*

win32/vid_menu.c

@@ -531,7 +531,7 @@ void VID_MenuDraw (void)
 	** draw the banner
 	*/
 	re.DrawGetPicSize( &w, &h, "m_banner_video" );
-	re.DrawPic( viddef.width / 2 - w * vid_hudscale->value / 2, viddef.height /2 - 110 * vid_hudscale->value, "m_banner_video" );
+	re.DrawPic( viddef.width / 2 - w / 2, viddef.height /2 - 110 * vid_hudscale->value, "m_banner_video" );
 
 	/*
 	** move cursor to a reasonable starting position