renamed NetConn_UpdateServerStuff to NetConn_UpdateSockets and made it non-static...

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index 0cb56cd386a290bbbad16ceec588d83e4e6f7b1a..ae87f58655997612fbb826060d998238eb61a7e9 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -2056,7 +2056,7 @@ void M_Options_Graphics_Key (int k, char ascii)
 int            options_colorcontrol_cursor;
 
 // intensity value to match up to 50% dither to 'correct' quake
-cvar_t menu_options_colorcontrol_correctionvalue = {0, "menu_options_colorcontrol_correctionvalue", "0.25"};
+cvar_t menu_options_colorcontrol_correctionvalue = {0, "menu_options_colorcontrol_correctionvalue", "0.25", "intensity value that matches up to white/black dither pattern, due to Quake's grey level being quite dark this is 0.25, other games may use other values"};
 
 void M_Menu_Options_ColorControl_f (void)
 {
@@ -2741,8 +2741,10 @@ video_resolution_t video_resolutions[] =
 {"Standard 4x3"              , 1024, 768, 640, 480, 1     },
 {"Standard 4x3"              , 1152, 864, 640, 480, 1     },
 {"Standard 4x3"              , 1280, 960, 640, 480, 1     },
+{"Standard 4x3"              , 1400,1050, 640, 480, 1     },
 {"Standard 4x3"              , 1600,1200, 640, 480, 1     },
 {"Standard 4x3"              , 1792,1344, 640, 480, 1     },
+{"Standard 4x3"              , 1856,1392, 640, 480, 1     },
 {"Standard 4x3"              , 1920,1440, 640, 480, 1     },
 {"Standard 4x3"              , 2048,1536, 640, 480, 1     },
 {"Short Pixel (CRT) 5x4"     ,  320, 256, 320, 256, 0.9375},
@@ -2761,8 +2763,11 @@ video_resolution_t video_resolutions[] =
 {"WideScreen 5x3"            , 1280, 768, 640, 384, 1     },
 {"WideScreen 8x5"            ,  320, 200, 320, 200, 1     },
 {"WideScreen 8x5"            ,  640, 400, 640, 400, 1     },
+{"WideScreen 8x5"            ,  720, 450, 720, 450, 1     },
 {"WideScreen 8x5"            ,  840, 525, 640, 400, 1     },
 {"WideScreen 8x5"            ,  960, 600, 640, 400, 1     },
+{"WideScreen 8x5"            , 1280, 800, 640, 400, 1     },
+{"WideScreen 8x5"            , 1440, 900, 720, 450, 1     },
 {"WideScreen 8x5"            , 1680,1050, 640, 400, 1     },
 {"WideScreen 8x5"            , 1920,1200, 640, 400, 1     },
 {"WideScreen 8x5"            , 2560,1600, 640, 400, 1     },
@@ -2780,7 +2785,7 @@ video_resolution_t video_resolutions[] =
 {"NTSC 3x2"                  ,  360, 240, 360, 240, 1.125 },
 {"NTSC 3x2"                  ,  720, 480, 720, 480, 1.125 },
 {"PAL 14x11"                 ,  360, 283, 360, 283, 0.9545},
-{"PAL 14x11"                 ,  720, 566, 360, 566, 0.9545},
+{"PAL 14x11"                 ,  720, 566, 720, 566, 0.9545},
 {"NES 8x7"                   ,  256, 224, 256, 224, 1.1667},
 {"SNES 8x7"                  ,  512, 448, 512, 448, 1.1667},
 {NULL, 0, 0, 0, 0, 0}
@@ -4365,24 +4370,24 @@ void M_Init (void)
        menuplyr_load = true;
        menuplyr_pixels = NULL;
 
-       Cmd_AddCommand ("menu_main", M_Menu_Main_f);
-       Cmd_AddCommand ("menu_singleplayer", M_Menu_SinglePlayer_f);
-       Cmd_AddCommand ("menu_load", M_Menu_Load_f);
-       Cmd_AddCommand ("menu_save", M_Menu_Save_f);
-       Cmd_AddCommand ("menu_multiplayer", M_Menu_MultiPlayer_f);
-       Cmd_AddCommand ("menu_setup", M_Menu_Setup_f);
-       Cmd_AddCommand ("menu_options", M_Menu_Options_f);
-       Cmd_AddCommand ("menu_options_effects", M_Menu_Options_Effects_f);
-       Cmd_AddCommand ("menu_options_graphics", M_Menu_Options_Graphics_f);
-       Cmd_AddCommand ("menu_options_colorcontrol", M_Menu_Options_ColorControl_f);
-       Cmd_AddCommand ("menu_keys", M_Menu_Keys_f);
-       Cmd_AddCommand ("menu_video", M_Menu_Video_f);
-       Cmd_AddCommand ("menu_reset", M_Menu_Reset_f);
-       Cmd_AddCommand ("help", M_Menu_Help_f);
-       Cmd_AddCommand ("menu_quit", M_Menu_Quit_f);
-       Cmd_AddCommand ("menu_transfusion_episode", M_Menu_Transfusion_Episode_f);
-       Cmd_AddCommand ("menu_transfusion_skill", M_Menu_Transfusion_Skill_f);
-       Cmd_AddCommand ("menu_credits", M_Menu_Credits_f);
+       Cmd_AddCommand ("menu_main", M_Menu_Main_f, "open the main menu");
+       Cmd_AddCommand ("menu_singleplayer", M_Menu_SinglePlayer_f, "open the singleplayer menu");
+       Cmd_AddCommand ("menu_load", M_Menu_Load_f, "open the loadgame menu");
+       Cmd_AddCommand ("menu_save", M_Menu_Save_f, "open the savegame menu");
+       Cmd_AddCommand ("menu_multiplayer", M_Menu_MultiPlayer_f, "open the multiplayer menu");
+       Cmd_AddCommand ("menu_setup", M_Menu_Setup_f, "open the player setup menu");
+       Cmd_AddCommand ("menu_options", M_Menu_Options_f, "open the options menu");
+       Cmd_AddCommand ("menu_options_effects", M_Menu_Options_Effects_f, "open the effects options menu");
+       Cmd_AddCommand ("menu_options_graphics", M_Menu_Options_Graphics_f, "open the graphics options menu");
+       Cmd_AddCommand ("menu_options_colorcontrol", M_Menu_Options_ColorControl_f, "open the color control menu");
+       Cmd_AddCommand ("menu_keys", M_Menu_Keys_f, "open the key binding menu");
+       Cmd_AddCommand ("menu_video", M_Menu_Video_f, "open the video options menu");
+       Cmd_AddCommand ("menu_reset", M_Menu_Reset_f, "open the reset to defaults menu");
+       Cmd_AddCommand ("help", M_Menu_Help_f, "open the help menu");
+       Cmd_AddCommand ("menu_quit", M_Menu_Quit_f, "open the quit menu");
+       Cmd_AddCommand ("menu_transfusion_episode", M_Menu_Transfusion_Episode_f, "open the transfusion episode select menu");
+       Cmd_AddCommand ("menu_transfusion_skill", M_Menu_Transfusion_Skill_f, "open the transfusion skill select menu");
+       Cmd_AddCommand ("menu_credits", M_Menu_Credits_f, "open the credits menu");
 
        if (gamemode == GAME_TRANSFUSION)
        {
@@ -4879,7 +4884,7 @@ void MP_Restart(void)
 //============================================================================
 // Menu router
 
-static cvar_t forceqmenu = { 0, "forceqmenu", "0" };
+static cvar_t forceqmenu = { 0, "forceqmenu", "0", "enables the quake menu instead of the quakec menu.dat (if present)" };
 
 void (*MR_Keydown) (int key, char ascii);
 void (*MR_Draw) (void);
@@ -4945,9 +4950,9 @@ void MR_Init_Commands(void)
        Cvar_RegisterVariable (&forceqmenu);
        Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue);
        if (gamemode == GAME_NETHERWORLD)
-               Cmd_AddCommand ("menu_fallback", MP_Fallback); //Force to old-style menu
-       Cmd_AddCommand ("menu_restart",MR_Restart);
-       Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f);
+               Cmd_AddCommand ("menu_fallback", MP_Fallback, "switch to engine menu (unload menu.dat)"); //Force to old-style menu
+       Cmd_AddCommand ("menu_restart",MR_Restart, "restart menu system (reloads menu.dat");
+       Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f, "opens or closes menu");
 }
 
 void MR_Init(void)