diff --git a/src/menus/options-hud-1.c b/src/menus/options-hud-1.c index 5b5f9f811..34c494955 100644 --- a/src/menus/options-hud-1.c +++ b/src/menus/options-hud-1.c @@ -4,7 +4,6 @@ #include "../k_menu.h" #include "../r_main.h" // cv_showhud #include "../v_video.h" // cv_constextsize -#include "../console.h" // console cvars menuitem_t OPTIONS_HUD[] = { @@ -21,12 +20,15 @@ menuitem_t OPTIONS_HUD[] = {IT_SPACE | IT_NOTHING, NULL, NULL, NULL, {NULL}, 0, 0}, +/* -- Nah, console isn't even bound by default, if you know how to use it you can change the size there {IT_STRING | IT_CVAR, "Console Text Size", "Size of the text within the console.", - NULL, {.cvar = &cv_constextsize}, 0, 0}, + NULL, {.cvar = &cv_constextsize}, 0, 0},*/ - // we spell words properly here. - {IT_STRING | IT_CVAR, "Console Tint", "Change the background colour of the console.", - NULL, {.cvar = &cons_backcolor}, 0, 0}, + {IT_STRING | IT_CVAR, "Show FPS", "Displays the game framerate at the lower right corner of the screen.", + NULL, {.cvar = &cv_ticrate}, 0, 0}, + + {IT_STRING | IT_CVAR, "Show Input Delay", "Displays your input delay at the lower right corner of the screen.", + NULL, {.cvar = &cv_showping}, 0, 0}, {IT_STRING | IT_CVAR, "Show \"FOCUS LOST\"", "Displays \"FOCUS LOST\" when the game window isn't the active window.", NULL, {.cvar = &cv_showfocuslost}, 0, 0}, @@ -34,7 +36,7 @@ menuitem_t OPTIONS_HUD[] = {IT_SPACE | IT_NOTHING, NULL, NULL, NULL, {NULL}, 0, 0}, - {IT_STRING | IT_SUBMENU, "Online HUD Options...", "HUD options related to the online chat box and other features.", + {IT_STRING | IT_SUBMENU, "Online Chat Options...", "HUD options related to the online chat box.", NULL, {.submenu = &OPTIONS_HUDOnlineDef}, 0, 0}, }; diff --git a/src/menus/options-hud-online.c b/src/menus/options-hud-online.c index e6cd9469d..b7449d28d 100644 --- a/src/menus/options-hud-online.c +++ b/src/menus/options-hud-online.c @@ -2,6 +2,7 @@ /// \brief Online HUD Options #include "../k_menu.h" +#include "../console.h" // console cvars menuitem_t OPTIONS_HUDOnline[] = { @@ -12,29 +13,23 @@ menuitem_t OPTIONS_HUDOnline[] = {IT_SPACE | IT_NOTHING, NULL, NULL, NULL, {NULL}, 0, 0}, - {IT_STRING | IT_CVAR, "Chat Box Tint", "Changes the background colour of the chat box.", - NULL, {.cvar = &cv_chatbacktint}, 0, 0}, + {IT_STRING | IT_CVAR, "Chat Box Tint", "Change the background color of the chat box.", + NULL, {.cvar = &cons_backcolor}, 0, 0}, - {IT_STRING | IT_CVAR | IT_CV_SLIDER, "Chat Box Width", "Change the width of the Chat Box", + {IT_STRING | IT_CVAR | IT_CV_SLIDER, "Chat Box Width", "Change the width of the Chat Box.", NULL, {.cvar = &cv_chatwidth}, 0, 0}, - {IT_STRING | IT_CVAR | IT_CV_SLIDER, "Chat Box Height", "Change the height of the Chat Box", + {IT_STRING | IT_CVAR | IT_CV_SLIDER, "Chat Box Height", "Change the height of the Chat Box.", NULL, {.cvar = &cv_chatheight}, 0, 0}, {IT_SPACE | IT_NOTHING, NULL, NULL, NULL, {NULL}, 0, 0}, - {IT_STRING | IT_CVAR, "Message Fadeout Time", "How long chat messages stay displayed with the chat closed.", + {IT_STRING | IT_CVAR, "Message Fadeout Time (s)", "How long chat messages stay displayed with the chat closed.", NULL, {.cvar = &cv_chattime}, 0, 0}, - {IT_STRING | IT_CVAR, "Spam Protection", "Prevents too many message from a single player from being displayed.", - NULL, {.cvar = &cv_chatspamprotection}, 0, 0}, - - {IT_SPACE | IT_NOTHING, NULL, NULL, - NULL, {NULL}, 0, 0}, - - {IT_STRING | IT_CVAR, "Local Ping Display", "In netgames, displays your ping at the lower right corner of the screen.", - NULL, {.cvar = &cv_showping}, 0, 0}, + {IT_STRING | IT_CVAR, "Message Tint", "Shows the tint for new chat messages when the box is closed.", + NULL, {.cvar = &cv_chatbacktint}, 0, 0}, }; diff --git a/src/menus/options-server-1.c b/src/menus/options-server-1.c index 893d28606..2b85ab610 100644 --- a/src/menus/options-server-1.c +++ b/src/menus/options-server-1.c @@ -40,6 +40,9 @@ menuitem_t OPTIONS_Server[] = {IT_STRING | IT_CVAR, "Mute Chat", "Prevents non-admins from sending chat messages.", NULL, {.cvar = &cv_mute}, 0, 0}, + {IT_STRING | IT_CVAR, "Chat Spam Protection", "Prevents too many message from a single player.", + NULL, {.cvar = &cv_chatspamprotection}, 0, 0}, + {IT_SPACE | IT_NOTHING, NULL, NULL, NULL, {NULL}, 0, 0}, diff --git a/src/menus/options-video-1.c b/src/menus/options-video-1.c index ea331d99d..be534ddf2 100644 --- a/src/menus/options-video-1.c +++ b/src/menus/options-video-1.c @@ -13,27 +13,31 @@ menuitem_t OPTIONS_Video[] = {IT_STRING | IT_CALL, "Set Resolution...", "Change the screen resolution for the game.", NULL, {.routine = M_VideoModeMenu}, 0, 0}, -// A check to see if you're not running on a fucking antique potato powered stone i guess??????? - #if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL) {IT_STRING | IT_CVAR, "Fullscreen", "Set whether you want to use fullscreen or windowed mode.", NULL, {.cvar = &cv_fullscreen}, 0, 0}, #endif + {IT_STRING | IT_CVAR, "Vertical Sync", "Works with your screen to reduce image tearing and judder.", NULL, {.cvar = &cv_vidwait}, 0, 0}, - {IT_NOTHING|IT_SPACE, NULL, "Kanade best waifu! I promise!", - NULL, {NULL}, 0, 0}, - - // Everytime I see a screenshot at max gamma I die inside - {IT_STRING | IT_CVAR | IT_CV_SLIDER, "Gamma", "Adjusts the overall brightness of the game.", - NULL, {.cvar = &cv_globalgamma}, 0, 0}, - {IT_STRING | IT_CVAR, "FPS Cap", "Handles the frame rate of the game (35 to match game logic)", NULL, {.cvar = &cv_fpscap}, 0, 0}, - {IT_STRING | IT_CVAR, "Enable Skyboxes", "Turning this off will improve performance at the detriment of visuals for many maps.", - NULL, {.cvar = &cv_skybox}, 0, 0}, + {IT_NOTHING|IT_SPACE, NULL, NULL, + NULL, {NULL}, 0, 0}, + + {IT_STRING | IT_CVAR, "Screen Tilting", "The view rotatation on inclines can be disabled to reduce motion sickness.", + NULL, {.cvar = &cv_tilting}, 0, 0}, + + {IT_STRING | IT_CVAR, "Reduce Visual Effects", "If on, some less-important particle cues will be hidden.", + NULL, {.cvar = &cv_reducevfx}, 0, 0}, + + {IT_STRING | IT_CVAR | IT_CV_SLIDER, "Gamma", "Adjusts the overall brightness of the game.", + NULL, {.cvar = &cv_globalgamma}, 0, 0}, + + {IT_NOTHING|IT_SPACE, NULL, NULL, + NULL, {NULL}, 0, 0}, {IT_STRING | IT_CVAR, "Draw Distance", "How far objects can be drawn. A tradeoff between performance & visibility.", NULL, {.cvar = &cv_drawdist}, 0, 0}, @@ -41,13 +45,13 @@ menuitem_t OPTIONS_Video[] = {IT_STRING | IT_CVAR, "Weather Draw Distance", "Affects how far weather visuals can be drawn. Lower values improve performance.", NULL, {.cvar = &cv_drawdist_precip}, 0, 0}, - {IT_STRING | IT_CVAR, "Show FPS", "Displays the game framerate at the lower right corner of the screen.", - NULL, {.cvar = &cv_ticrate}, 0, 0}, - - {IT_NOTHING|IT_SPACE, NULL, "Kanade best waifu! I promise!", - NULL, {NULL}, 0, 0}, + {IT_STRING | IT_CVAR, "Enable Skyboxes", "Turning this off may improve performance, but reduces courses' background details.", + NULL, {.cvar = &cv_skybox}, 0, 0}, #ifdef HWRENDER + {IT_NOTHING|IT_SPACE, NULL, NULL, + NULL, {NULL}, 0, 0}, + {IT_STRING | IT_SUBMENU, "Hardware Options...", "For usage and configuration of the OpenGL renderer.", NULL, {.submenu = &OPTIONS_VideoOGLDef}, 0, 0}, #endif @@ -59,7 +63,7 @@ menu_t OPTIONS_VideoDef = { &OPTIONS_MainDef, 0, OPTIONS_Video, - 32, 80, + 32, 80-8, SKINCOLOR_PLAGUE, 0, MBF_DRAWBGWHILEPLAYING, NULL, diff --git a/src/menus/play-online-join-ip.c b/src/menus/play-online-join-ip.c index 28e20d38e..e7a839714 100644 --- a/src/menus/play-online-join-ip.c +++ b/src/menus/play-online-join-ip.c @@ -19,7 +19,7 @@ menuitem_t PLAY_MP_JoinIP[] = {IT_STRING, "CONNECT ", "Attempt to connect to the server you entered the IP for.", NULL, {NULL}, 0, 0}, - {IT_STRING | IT_SPACE, "LAST IPs JOINED:", "Kanade best waifu :)", + {IT_STRING | IT_SPACE, "LAST IPs JOINED:", NULL, NULL, {NULL}, 0, 0}, {IT_STRING, "servip1", "The last 3 IPs you've succesfully joined are displayed here.",