vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Menu-FN: Added cvar menu_helptext_size, don't expect this one to be around

Browse source 
forever, it'll be used to detect quirks in freetype scaling.
This commit is contained in:
Marco Cawthorne 2021-04-15 20:46:54 +02:00
parent 07094f1cb4
commit da62296b9c
6 changed files with 52 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/menu-fn/defs.h
View file

@ -53,6 +53,10 @@ int font_console;
int font_arial;
int font_label_p;
var int autocvar_menu_helptext_size = 11;
#define HELPTXT_SIZE autocvar_menu_helptext_size
typedef struct
{
void(void) m_init;

12
src/menu-fn/m_configuration.qc
View file

@ -154,17 +154,17 @@ menu_configuration_draw(void)
Widget_Draw(fn_configuration);
Header_Draw(HEAD_CONFIG);
WLabel_Static(215, 148, m_reslbl[IDS_CFG_CONTROLHELP], 10, 10, col_help,
WLabel_Static(215, 148, m_reslbl[IDS_CFG_CONTROLHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 180, m_reslbl[IDS_CFG_AUDIOHELP], 10, 10, col_help,
WLabel_Static(215, 180, m_reslbl[IDS_CFG_AUDIOHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 212, m_reslbl[IDS_CFG_VIDHELP], 10, 10, col_help,
WLabel_Static(215, 212, m_reslbl[IDS_CFG_VIDHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 244, m_reslbl[IDS_CONFIGURE_GOREHELP], 10, 10, col_help,
WLabel_Static(215, 244, m_reslbl[IDS_CONFIGURE_GOREHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 276, m_reslbl[IDS_CONFIGURE_AUTOPATCHHELP], 10, 10, col_help,
WLabel_Static(215, 276, m_reslbl[IDS_CONFIGURE_AUTOPATCHHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 308, m_reslbl[IDS_MULTI_DONEHELP], 10, 10, col_help,
WLabel_Static(215, 308, m_reslbl[IDS_MULTI_DONEHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
}

36
src/menu-fn/m_main.qc
View file

@ -353,23 +353,23 @@ menu_main_draw(void)
{
if (clientstate() == 2 && !g_background) {
Widget_Draw(fn_main2);
WLabel_Static(235, 216, m_reslbl[IDS_MAIN_RETURNHELP], 10, 10,
WLabel_Static(235, 216, m_reslbl[IDS_MAIN_RETURNHELP], HELPTXT_SIZE, HELPTXT_SIZE,
col_help,1.0f, 0, font_label);
WLabel_Static(235, 244, m_reslbl[IDS_MAIN_NEWGAMEHELP], 10, 10,
WLabel_Static(235, 244, m_reslbl[IDS_MAIN_NEWGAMEHELP], HELPTXT_SIZE, HELPTXT_SIZE,
col_help,1.0f, 0, font_label);
WLabel_Static(235, 272, m_reslbl[IDS_MAIN_TRAININGHELP], 10, 10,
WLabel_Static(235, 272, m_reslbl[IDS_MAIN_TRAININGHELP], HELPTXT_SIZE, HELPTXT_SIZE,
col_help,1.0f, 0, font_label);
WLabel_Static(235, 300, m_reslbl[IDS_MAIN_CONFIGUREHELP], 10, 10,
WLabel_Static(235, 300, m_reslbl[IDS_MAIN_CONFIGUREHELP], HELPTXT_SIZE, HELPTXT_SIZE,
col_help,1.0f, 0, font_label);
WLabel_Static(235, 328, m_reslbl[IDS_MAIN_LOADSAVEHELP], 10, 10,
WLabel_Static(235, 328, m_reslbl[IDS_MAIN_LOADSAVEHELP], HELPTXT_SIZE, HELPTXT_SIZE,
col_help,1.0f, 0, font_label);
WLabel_Static(235, 356, m_reslbl[IDS_MAIN_MULTIPLAYERHELP], 10, 10,
WLabel_Static(235, 356, m_reslbl[IDS_MAIN_MULTIPLAYERHELP], HELPTXT_SIZE, HELPTXT_SIZE,
col_help,1.0f, 0, font_label);
WLabel_Static(235, 384, m_reslbl[IDS_MAIN_CUSTOMHELP], 10, 10,
WLabel_Static(235, 384, m_reslbl[IDS_MAIN_CUSTOMHELP], HELPTXT_SIZE, HELPTXT_SIZE,
col_help,1.0f, 0, font_label);
WLabel_Static(235, 412, m_reslbl[IDS_MAIN_PREVIEWSHELP], 10, 10,
WLabel_Static(235, 412, m_reslbl[IDS_MAIN_PREVIEWSHELP], HELPTXT_SIZE, HELPTXT_SIZE,
col_help,1.0f, 0, font_label);
WLabel_Static(235, 440, m_reslbl[IDS_MAIN_QUITHELP], 10, 10,
WLabel_Static(235, 440, m_reslbl[IDS_MAIN_QUITHELP], HELPTXT_SIZE, HELPTXT_SIZE,
col_help,1.0f, 0, font_label);
} else {
/* Don't even attempt to display the logo.avi otherwise */
@ -380,23 +380,23 @@ menu_main_draw(void)
}
Widget_Draw(fn_main);
WLabel_Static(235, 216, m_reslbl[IDS_MAIN_NEWGAMEHELP], 10, 10,
WLabel_Static(235, 216, m_reslbl[IDS_MAIN_NEWGAMEHELP], HELPTXT_SIZE, HELPTXT_SIZE,
col_help,1.0f, 0, font_label);
WLabel_Static(235, 244, m_reslbl[IDS_MAIN_TRAININGHELP], 10, 10,
WLabel_Static(235, 244, m_reslbl[IDS_MAIN_TRAININGHELP], HELPTXT_SIZE, HELPTXT_SIZE,
col_help,1.0f, 0, font_label);
WLabel_Static(235, 272, m_reslbl[IDS_MAIN_CONFIGUREHELP], 10, 10,
WLabel_Static(235, 272, m_reslbl[IDS_MAIN_CONFIGUREHELP], HELPTXT_SIZE, HELPTXT_SIZE,
col_help,1.0f, 0, font_label);
WLabel_Static(235, 300, m_reslbl[IDS_MAIN_LOADHELP], 10, 10,
WLabel_Static(235, 300, m_reslbl[IDS_MAIN_LOADHELP], HELPTXT_SIZE, HELPTXT_SIZE,
col_help,1.0f, 0, font_label);
WLabel_Static(235, 328, m_reslbl[IDS_MAIN_MULTIPLAYERHELP], 10, 10,
WLabel_Static(235, 328, m_reslbl[IDS_MAIN_MULTIPLAYERHELP], HELPTXT_SIZE, HELPTXT_SIZE,
col_help,1.0f, 0, font_label);
WLabel_Static(235, 356, m_reslbl[IDS_MAIN_CUSTOMHELP], 10, 10,
WLabel_Static(235, 356, m_reslbl[IDS_MAIN_CUSTOMHELP], HELPTXT_SIZE, HELPTXT_SIZE,
col_help,1.0f, 0, font_label);
WLabel_Static(235, 384, m_reslbl[IDS_MAIN_READMEHELP], 10, 10,
WLabel_Static(235, 384, m_reslbl[IDS_MAIN_READMEHELP], HELPTXT_SIZE, HELPTXT_SIZE,
col_help,1.0f, 0, font_label);
WLabel_Static(235, 412, m_reslbl[IDS_MAIN_PREVIEWSHELP], 10, 10,
WLabel_Static(235, 412, m_reslbl[IDS_MAIN_PREVIEWSHELP], HELPTXT_SIZE, HELPTXT_SIZE,
col_help,1.0f, 0, font_label);
WLabel_Static(235, 440, m_reslbl[IDS_MAIN_QUITHELP], 10, 10,
WLabel_Static(235, 440, m_reslbl[IDS_MAIN_QUITHELP], HELPTXT_SIZE, HELPTXT_SIZE,
col_help,1.0f, 0, font_label);
}

34
src/menu-fn/m_multiplayer.qc
View file

@ -293,42 +293,42 @@ menu_multiplayer_draw(void)
if (!autocvar__menu_singleplayer && clientstate() == 2 && !g_background) {
Widget_Draw(fn_multiplayer2);
WLabel_Static(215, 148, m_reslbl[IDS_MULTI_RESUMEHELP], 10, 10, col_help,
WLabel_Static(215, 148, m_reslbl[IDS_MULTI_RESUMEHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 180, m_reslbl[IDS_MULTI_DISCONNECTHELP], 10, 10, col_help,
WLabel_Static(215, 180, m_reslbl[IDS_MULTI_DISCONNECTHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 212, m_reslbl[IDS_MULTI_BROWSEHELP], 10, 10, col_help,
WLabel_Static(215, 212, m_reslbl[IDS_MULTI_BROWSEHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 244, "Spectate internet games.", 10, 10, col_help,
WLabel_Static(215, 244, "Spectate internet games.", HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 276, m_reslbl[IDS_MULTI_CHATHELP], 10, 10, col_help,
WLabel_Static(215, 276, m_reslbl[IDS_MULTI_CHATHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 308, m_reslbl[IDS_MULTI_LANHELP], 10, 10, col_help,
WLabel_Static(215, 308, m_reslbl[IDS_MULTI_LANHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 340, m_reslbl[IDS_MULTI_CUSTOMIZEHELP], 10, 10, col_help,
WLabel_Static(215, 340, m_reslbl[IDS_MULTI_CUSTOMIZEHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 372, m_reslbl[IDS_CFG_CONTROLHELP], 10, 10, col_help,
WLabel_Static(215, 372, m_reslbl[IDS_CFG_CONTROLHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 404, m_reslbl[IDS_MULTI_DONEHELP], 10, 10, col_help,
WLabel_Static(215, 404, m_reslbl[IDS_MULTI_DONEHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
} else {
Widget_Draw(fn_multiplayer);
WLabel_Static(215, 148, m_reslbl[IDS_MAIN_QUICKHELP], 10, 10, col_help,
WLabel_Static(215, 148, m_reslbl[IDS_MAIN_QUICKHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 180, m_reslbl[IDS_MULTI_BROWSEHELP], 10, 10, col_help,
WLabel_Static(215, 180, m_reslbl[IDS_MULTI_BROWSEHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 212, "Spectate internet games.", 10, 10, col_help,
WLabel_Static(215, 212, "Spectate internet games.", HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 244, m_reslbl[IDS_MULTI_CHATHELP], 10, 10, col_help,
WLabel_Static(215, 244, m_reslbl[IDS_MULTI_CHATHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 276, m_reslbl[IDS_MULTI_LANHELP], 10, 10, col_help,
WLabel_Static(215, 276, m_reslbl[IDS_MULTI_LANHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 308, m_reslbl[IDS_MULTI_CUSTOMIZEHELP], 10, 10, col_help,
WLabel_Static(215, 308, m_reslbl[IDS_MULTI_CUSTOMIZEHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 340, m_reslbl[IDS_CFG_CONTROLHELP], 10, 10, col_help,
WLabel_Static(215, 340, m_reslbl[IDS_CFG_CONTROLHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 372, m_reslbl[IDS_MULTI_DONEHELP], 10, 10, col_help,
WLabel_Static(215, 372, m_reslbl[IDS_MULTI_DONEHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
}

8
src/menu-fn/m_newgame.qc
View file

@ -127,13 +127,13 @@ menu_newgame_draw(void)
Widget_Draw(fn_newgame);
Header_Draw(HEAD_NEWGAME);
WLabel_Static(215, 148, m_reslbl[IDS_NEWGAME_EASYHELP], 10, 10, col_help,
WLabel_Static(215, 148, m_reslbl[IDS_NEWGAME_EASYHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 180, m_reslbl[IDS_NEWGAME_MEDIUMHELP], 10, 10, col_help,
WLabel_Static(215, 180, m_reslbl[IDS_NEWGAME_MEDIUMHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 212, m_reslbl[IDS_NEWGAME_DIFFICULTHELP], 10, 10, col_help,
WLabel_Static(215, 212, m_reslbl[IDS_NEWGAME_DIFFICULTHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 244, m_reslbl[IDS_NEWGAME_RETURNHELP], 10, 10, col_help,
WLabel_Static(215, 244, m_reslbl[IDS_NEWGAME_RETURNHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
}

6
src/menu-fn/m_video.qc
View file

@ -93,11 +93,11 @@ menu_video_draw(void)
{
Widget_Draw(fn_video);
Header_Draw(HEAD_VIDEO);
WLabel_Static(215, 148, m_reslbl[IDS_VIDSELECT_OPTIONSHELP], 10, 10, col_help,
WLabel_Static(215, 148, m_reslbl[IDS_VIDSELECT_OPTIONSHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 180, m_reslbl[IDS_VIDSELECT_MODESHELP], 10, 10, col_help,
WLabel_Static(215, 180, m_reslbl[IDS_VIDSELECT_MODESHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
WLabel_Static(215, 212, m_reslbl[IDS_VIDSELECT_RETURNHELP], 10, 10, col_help,
WLabel_Static(215, 212, m_reslbl[IDS_VIDSELECT_RETURNHELP], HELPTXT_SIZE, HELPTXT_SIZE, col_help,
1.0f, 0, font_label);
}