diff --git a/src/menu-fn/defs.h b/src/menu-fn/defs.h index 45ae3ccc..ccc6d9ff 100644 --- a/src/menu-fn/defs.h +++ b/src/menu-fn/defs.h @@ -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; diff --git a/src/menu-fn/m_configuration.qc b/src/menu-fn/m_configuration.qc index 4d2d6aa1..ce6c6b59 100644 --- a/src/menu-fn/m_configuration.qc +++ b/src/menu-fn/m_configuration.qc @@ -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); } diff --git a/src/menu-fn/m_main.qc b/src/menu-fn/m_main.qc index d9130c9e..9a563555 100644 --- a/src/menu-fn/m_main.qc +++ b/src/menu-fn/m_main.qc @@ -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); } diff --git a/src/menu-fn/m_multiplayer.qc b/src/menu-fn/m_multiplayer.qc index 26f200aa..b26074f2 100644 --- a/src/menu-fn/m_multiplayer.qc +++ b/src/menu-fn/m_multiplayer.qc @@ -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); } diff --git a/src/menu-fn/m_newgame.qc b/src/menu-fn/m_newgame.qc index e6918a2f..9465713d 100644 --- a/src/menu-fn/m_newgame.qc +++ b/src/menu-fn/m_newgame.qc @@ -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); } diff --git a/src/menu-fn/m_video.qc b/src/menu-fn/m_video.qc index 45c2ce75..8ad6c6d4 100644 --- a/src/menu-fn/m_video.qc +++ b/src/menu-fn/m_video.qc @@ -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); }