yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-25 05:51:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implement scaling of several non-menu elements

Browse source 
- The loading plaque
- The pause plaque
- The "Quit Screen"
This commit is contained in:
Yamagi Burmeister 2014-06-24 19:33:34 +02:00
parent af70f276a9
commit 3fc549ca42
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/client/cl_screen.c
View file

@ -449,18 +449,21 @@ SCR_Init(void)
void
SCR_DrawNet(void)
{
float scale = SCR_GetMenuScale();
if (cls.netchan.outgoing_sequence - cls.netchan.incoming_acknowledged < CMD_BACKUP - 1)
{
return;
}
Draw_Pic(scr_vrect.x + 64, scr_vrect.y, "net");
Draw_PicScaled(scr_vrect.x + 64 * scale, scr_vrect.y, "net", scale);
}
void
SCR_DrawPause(void)
{
int w, h;
float scale = SCR_GetMenuScale();
if (!scr_showpause->value) /* turn off for screenshots */
{
@ -473,13 +476,14 @@ SCR_DrawPause(void)
}
Draw_GetPicSize(&w, &h, "pause");
Draw_Pic((viddef.width - w) / 2, viddef.height / 2 + 8, "pause");
Draw_PicScaled((viddef.width - w * scale) / 2, viddef.height / 2 + 8 * scale, "pause", scale);
}
void
SCR_DrawLoading(void)
{
int w, h;
float scale = SCR_GetMenuScale();
if (!scr_draw_loading)
{
@ -488,7 +492,7 @@ SCR_DrawLoading(void)
scr_draw_loading = false;
Draw_GetPicSize(&w, &h, "loading");
Draw_Pic((viddef.width - w) / 2, (viddef.height - h) / 2, "loading");
Draw_PicScaled((viddef.width - w * scale) / 2, (viddef.height - h * scale) / 2, "loading", scale);
}
/*
@ -1415,6 +1419,7 @@ SCR_UpdateScreen(void)
int numframes;
int i;
float separation[2] = {0, 0};
float scale = SCR_GetMenuScale();
/* if the screen is disabled (loading plaque is
up, or vid mode changing) do nothing at all */
@ -1450,7 +1455,7 @@ SCR_UpdateScreen(void)
R_SetPalette(NULL);
scr_draw_loading = false;
Draw_GetPicSize(&w, &h, "loading");
Draw_Pic((viddef.width - w) / 2, (viddef.height - h) / 2, "loading");
Draw_PicScaled((viddef.width - w * scale) / 2, (viddef.height - h * scale) / 2, "loading", scale);
}
/* if a cinematic is supposed to be running,

3
src/client/menu/menu.c
View file

@ -4390,9 +4390,10 @@ static void
M_Quit_Draw(void)
{
int w, h;
float scale = SCR_GetMenuScale();
Draw_GetPicSize(&w, &h, "quit");
Draw_Pic((viddef.width - w) / 2, (viddef.height - h) / 2, "quit");
Draw_PicScaled((viddef.width - w * scale) / 2, (viddef.height - h * scale) / 2, "quit", scale);
}
static void