diff --git a/src/Makefile.d/versions.mk b/src/Makefile.d/versions.mk
index 7c130d90846ab6f4199eb618ee918fdb6999e5cc..470010e8ba098bef3636a085bc32bc76458bf475 100644
--- a/src/Makefile.d/versions.mk
+++ b/src/Makefile.d/versions.mk
@@ -85,7 +85,7 @@ endif
#WFLAGS+=-Wunreachable-code
WFLAGS+=-Winline
ifdef DEBUGMODE
- WFLAGS+=-Wno-error=inline
+ WFLAGS+=-Wno-inline
endif
ifdef GCC43
WFLAGS+=-funit-at-a-time
diff --git a/src/command.c b/src/command.c
index bc24d5e0524b00aa9123007190b3dd68689cf1cd..ff95761c3df38a2c44951c5e120a0990b85e0649 100644
--- a/src/command.c
+++ b/src/command.c
@@ -85,7 +85,7 @@ CV_PossibleValue_t CV_TrueFalse[] = {{0, "False"}, {1, "True"}, {0, NULL}};
// First implementation is 26 (2.1.21), so earlier configs default at 25 (2.1.20)
// Also set CV_HIDEN during runtime, after config is loaded
static boolean execversion_enabled = false;
-consvar_t cv_execversion = CVAR_INIT ("execversion","25",CV_CALL,CV_Unsigned, CV_EnforceExecVersion);
+consvar_t cv_execversion = CVAR_INIT ("execversion", "25", NULL, CV_CALL, CV_Unsigned, CV_EnforceExecVersion);
// for default joyaxis detection
static boolean joyaxis_default = false;
@@ -315,6 +315,7 @@ void COM_ImmedExecute(const char *ptext)
typedef struct xcommand_s
{
const char *name;
+ const char *desc;
struct xcommand_s *next;
com_func_t function;
com_flags_t flags;
@@ -338,17 +339,17 @@ void COM_Init(void)
VS_Alloc(&com_text, COM_BUF_SIZE);
// add standard commands
- COM_AddCommand("alias", COM_Alias_f, 0);
- COM_AddCommand("echo", COM_Echo_f, COM_LUA);
- COM_AddCommand("cecho", COM_CEcho_f, COM_LUA);
- COM_AddCommand("cechoflags", COM_CEchoFlags_f, COM_LUA);
- COM_AddCommand("cechoduration", COM_CEchoDuration_f, COM_LUA);
- COM_AddCommand("exec", COM_Exec_f, 0);
- COM_AddCommand("wait", COM_Wait_f, 0);
- COM_AddCommand("help", COM_Help_f, COM_LUA);
- COM_AddCommand("find", COM_Find_f, COM_LUA);
- COM_AddCommand("toggle", COM_Toggle_f, COM_LUA);
- COM_AddCommand("add", COM_Add_f, COM_LUA);
+ COM_AddCommand("alias", "Create or list commands that expand to other commands", COM_Alias_f, 0);
+ COM_AddCommand("echo", "Print the specified text, useful for scripts", COM_Echo_f, COM_LUA);
+ COM_AddCommand("cecho", "Display text on-screen", COM_CEcho_f, COM_LUA);
+ COM_AddCommand("cechoflags", NULL, COM_CEchoFlags_f, COM_LUA);
+ COM_AddCommand("cechoduration", NULL, COM_CEchoDuration_f, COM_LUA);
+ COM_AddCommand("exec", "Run a script", COM_Exec_f, 0);
+ COM_AddCommand("wait", NULL, COM_Wait_f, 0);
+ COM_AddCommand("help", "Show information about a variable or command", COM_Help_f, COM_LUA);
+ COM_AddCommand("find", "Search commands and variables", COM_Find_f, COM_LUA);
+ COM_AddCommand("toggle", "Toggle a variable on or off", COM_Toggle_f, COM_LUA);
+ COM_AddCommand("add", NULL, COM_Add_f, COM_LUA);
RegisterNetXCmd(XD_NETVAR, Got_NetVar);
}
@@ -487,7 +488,7 @@ static void COM_TokenizeString(char *ptext)
* \param name Name of the command.
* \param func Function called when the command is run.
*/
-void COM_AddCommand(const char *name, com_func_t func, com_flags_t flags)
+void COM_AddCommand(const char *name, const char *desc, com_func_t func, com_flags_t flags)
{
xcommand_t *cmd;
@@ -516,6 +517,7 @@ void COM_AddCommand(const char *name, com_func_t func, com_flags_t flags)
cmd = ZZ_Alloc(sizeof *cmd);
cmd->name = name;
+ cmd->desc = desc;
cmd->function = func;
cmd->flags = flags;
cmd->next = com_commands;
@@ -527,7 +529,7 @@ void COM_AddCommand(const char *name, com_func_t func, com_flags_t flags)
*
* \param name Name of the command.
*/
-int COM_AddLuaCommand(const char *name)
+int COM_AddLuaCommand(const char *name, const char *desc)
{
xcommand_t *cmd;
@@ -549,6 +551,7 @@ int COM_AddLuaCommand(const char *name)
// Add a new command.
cmd = ZZ_Alloc(sizeof *cmd);
cmd->name = name;
+ cmd->desc = desc;
cmd->function = COM_Lua_f;
cmd->flags = COM_LUA;
cmd->next = com_commands;
@@ -892,7 +895,12 @@ static void COM_Help_f(void)
{
boolean floatmode = false;
const char *cvalue = NULL;
- CONS_Printf("\x82""Variable %s:\n", cvar->name);
+ CONS_Printf("\x82""Variable %s: \x80", cvar->name);
+ if (cvar->desc != NULL)
+ CONS_Printf("%s\n", cvar->desc);
+ else
+ CONS_Printf("No description provided\n");
+
CONS_Printf(M_GetText(" flags: "));
if (cvar->flags & CV_SAVE)
CONS_Printf("AUTOSAVE ");
@@ -984,14 +992,15 @@ static void COM_Help_f(void)
if (strcmp(cmd->name, help))
continue;
- CONS_Printf("\x82""Command %s:\n", cmd->name);
- CONS_Printf(" help is not available for commands");
- CONS_Printf("\x82""\nCheck wiki.srb2.org for more or try typing <name> without arguments\n");
+ CONS_Printf("\x82""Command %s: \x80", cmd->name);
+ if (cmd->desc != NULL)
+ CONS_Printf("%s\n", cmd->desc);
+ else
+ CONS_Printf("No description provided\n");
return;
}
- CONS_Printf("No variable or command named %s", help);
- CONS_Printf("\x82""\nCheck wiki.srb2.org for more or try typing help without arguments\n");
+ CONS_Printf("No variable or command named %s\n", help);
}
return;
}
@@ -1014,8 +1023,7 @@ static void COM_Help_f(void)
CONS_Printf("%s ",cmd->name);
i++;
}
-
- CONS_Printf("\x82""\nCheck wiki.srb2.org for more or type help <command or variable>\n");
+ CONS_Printf("\n");
CONS_Debug(DBG_GAMELOGIC, "\x82Total : %d\n", i);
}
diff --git a/src/command.h b/src/command.h
index 70342a78512783e6ea3bf3fc2122bee21d074099..375fef881144b9dcf7dccd659e280accba43dc45 100644
--- a/src/command.h
+++ b/src/command.h
@@ -37,8 +37,8 @@ typedef enum
typedef void (*com_func_t)(void);
-void COM_AddCommand(const char *name, com_func_t func, com_flags_t flags);
-int COM_AddLuaCommand(const char *name);
+void COM_AddCommand(const char *name, const char *desc, com_func_t func, com_flags_t flags);
+int COM_AddLuaCommand(const char *name, const char *desc);
size_t COM_Argc(void);
const char *COM_Argv(size_t arg); // if argv > argc, returns empty string
@@ -137,6 +137,7 @@ typedef struct consvar_s //NULL, NULL, 0, NULL, NULL |, 0, NULL, NULL, 0, 0, NUL
{
const char *name;
const char *defaultvalue;
+ const char *desc;
INT32 flags; // flags see cvflags_t above
CV_PossibleValue_t *PossibleValue; // table of possible values
void (*func)(void); // called on change, if CV_CALL set
@@ -161,7 +162,7 @@ typedef struct consvar_s //NULL, NULL, 0, NULL, NULL |, 0, NULL, NULL, 0, 0, NUL
struct consvar_s *next;
} consvar_t;
-/* name, defaultvalue, flags, PossibleValue, func */
+/* name, defaultvalue, desc, flags, PossibleValue, func */
#define CVAR_INIT( ... ) \
{ __VA_ARGS__, NULL, 0, NULL, NULL, {0, {NULL}}, 0U, (char)0, NULL }
diff --git a/src/console.c b/src/console.c
index b5923bd6cad2a88f90e0700c6f1ab09f334d40e6..4d6766499b114b3b56fc88e4a42b0a66b4d2bb42 100644
--- a/src/console.c
+++ b/src/console.c
@@ -123,23 +123,23 @@ static char con_buffer[CON_BUFFERSIZE];
// how many seconds the hud messages lasts on the screen
// CV_Unsigned can overflow when multiplied by TICRATE later, so let's use a 3-year limit instead
static CV_PossibleValue_t hudtime_cons_t[] = {{0, "MIN"}, {99999999, "MAX"}, {0, NULL}};
-static consvar_t cons_hudtime = CVAR_INIT ("con_hudtime", "5", CV_SAVE, hudtime_cons_t, NULL);
+static consvar_t cons_hudtime = CVAR_INIT ("con_hudtime", "5", NULL, CV_SAVE, hudtime_cons_t, NULL);
// number of lines displayed on the HUD
static CV_PossibleValue_t hudlines_cons_t[] = {{0, "MIN"}, {MAXHUDLINES, "MAX"}, {0, NULL}};
-static consvar_t cons_hudlines = CVAR_INIT ("con_hudlines", "5", CV_CALL|CV_SAVE, hudlines_cons_t, CONS_hudlines_Change);
+static consvar_t cons_hudlines = CVAR_INIT ("con_hudlines", "5", NULL, CV_CALL|CV_SAVE, hudlines_cons_t, CONS_hudlines_Change);
// number of lines console move per frame
// (con_speed needs a limit, apparently)
static CV_PossibleValue_t speed_cons_t[] = {{0, "MIN"}, {64, "MAX"}, {0, NULL}};
-static consvar_t cons_speed = CVAR_INIT ("con_speed", "8", CV_SAVE, speed_cons_t, NULL);
+static consvar_t cons_speed = CVAR_INIT ("con_speed", "8", NULL, CV_SAVE, speed_cons_t, NULL);
// percentage of screen height to use for console
-static consvar_t cons_height = CVAR_INIT ("con_height", "50", CV_CALL|CV_SAVE, CV_Unsigned, CONS_height_Change);
+static consvar_t cons_height = CVAR_INIT ("con_height", "50", NULL, CV_CALL|CV_SAVE, CV_Unsigned, CONS_height_Change);
static CV_PossibleValue_t backpic_cons_t[] = {{0, "translucent"}, {1, "picture"}, {0, NULL}};
// whether to use console background picture, or translucent mode
-static consvar_t cons_backpic = CVAR_INIT ("con_backpic", "translucent", CV_SAVE, backpic_cons_t, NULL);
+static consvar_t cons_backpic = CVAR_INIT ("con_backpic", "translucent", NULL, CV_SAVE, backpic_cons_t, NULL);
static CV_PossibleValue_t backcolor_cons_t[] = {{0, "White"}, {1, "Black"}, {2, "Sepia"},
{3, "Brown"}, {4, "Pink"}, {5, "Raspberry"},
@@ -151,7 +151,7 @@ static CV_PossibleValue_t backcolor_cons_t[] = {{0, "White"}, {1, "Black"}, {
{0, NULL}};
-consvar_t cons_backcolor = CVAR_INIT ("con_backcolor", "Green", CV_CALL|CV_SAVE, backcolor_cons_t, CONS_backcolor_Change);
+consvar_t cons_backcolor = CVAR_INIT ("con_backcolor", "Green", NULL, CV_CALL|CV_SAVE, backcolor_cons_t, CONS_backcolor_Change);
static void CON_Print(char *msg);
@@ -477,7 +477,7 @@ void CON_Init(void)
// register our commands
//
- COM_AddCommand("cls", CONS_Clear_f, 0);
+ COM_AddCommand("cls", "Clear the console", CONS_Clear_f, 0);
//COM_AddCommand("english", CONS_English_f);
// set console full screen for game startup MAKE SURE VID_Init() done !!!
Lock_state();
@@ -504,7 +504,7 @@ void CON_Init(void)
CV_RegisterVar(&cons_height);
CV_RegisterVar(&cons_backpic);
CV_RegisterVar(&cons_backcolor);
- COM_AddCommand("bind", CONS_Bind_f, 0);
+ COM_AddCommand("bind", "Bind a command to a button", CONS_Bind_f, 0);
}
else
{
diff --git a/src/d_main.c b/src/d_main.c
index e9969459907499d206595048cc47cd1c9ecd5ac2..b0eefd690ec09b68f601bfd5c0e2ca9bad8a8d67 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1390,7 +1390,7 @@ void D_SRB2Main(void)
// Do this up here so that WADs loaded through the command line can use ExecCfg
COM_Init();
- COM_AddCommand("assert", Command_assert, COM_LUA);
+ COM_AddCommand("assert", NULL, Command_assert, COM_LUA);
// Add any files specified on the command line with
// "-file <file>" or "-folder <folder>" to the add-on list
diff --git a/src/dedicated/i_video.c b/src/dedicated/i_video.c
index 85e78fc508224e7a56085c64203a691ff7c9369e..72fe0cdd50c324f783cd22f67254feca262bbb23 100644
--- a/src/dedicated/i_video.c
+++ b/src/dedicated/i_video.c
@@ -7,7 +7,7 @@ rendermode_t chosenrendermode = render_none;
boolean allow_fullscreen = false;
-consvar_t cv_vidwait = CVAR_INIT ("vid_wait", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_vidwait = CVAR_INIT ("vid_wait", "On", "Has no effect on this build", CV_SAVE, CV_OnOff, NULL);
void I_StartupGraphics(void){}
void I_ShutdownGraphics(void){}
diff --git a/src/filesrch.c b/src/filesrch.c
index 7f104f8cac58ba1e109605b5b0598f14b3a86ce6..fa2d7c1ea7e0528d8e692895dced19e612b8485f 100644
--- a/src/filesrch.c
+++ b/src/filesrch.c
@@ -357,18 +357,18 @@ static CV_PossibleValue_t addons_cons_t[] = {{0, "Default"},
#endif
{3, "CUSTOM"}, {0, NULL}};
-consvar_t cv_addons_option = CVAR_INIT ("addons_option", "Default", CV_SAVE|CV_CALL, addons_cons_t, Addons_option_Onchange);
-consvar_t cv_addons_folder = CVAR_INIT ("addons_folder", "", CV_SAVE, NULL, NULL);
+consvar_t cv_addons_option = CVAR_INIT ("addons_option", "Default", NULL, CV_SAVE|CV_CALL, addons_cons_t, Addons_option_Onchange);
+consvar_t cv_addons_folder = CVAR_INIT ("addons_folder", "", NULL, CV_SAVE, NULL, NULL);
static CV_PossibleValue_t addons_md5_cons_t[] = {{0, "Name"}, {1, "Contents"}, {0, NULL}};
-consvar_t cv_addons_md5 = CVAR_INIT ("addons_md5", "Name", CV_SAVE, addons_md5_cons_t, NULL);
+consvar_t cv_addons_md5 = CVAR_INIT ("addons_md5", "Name", NULL, CV_SAVE, addons_md5_cons_t, NULL);
-consvar_t cv_addons_showall = CVAR_INIT ("addons_showall", "No", CV_SAVE, CV_YesNo, NULL);
+consvar_t cv_addons_showall = CVAR_INIT ("addons_showall", "No", NULL, CV_SAVE, CV_YesNo, NULL);
-consvar_t cv_addons_search_case = CVAR_INIT ("addons_search_case", "No", CV_SAVE, CV_YesNo, NULL);
+consvar_t cv_addons_search_case = CVAR_INIT ("addons_search_case", "No", NULL, CV_SAVE, CV_YesNo, NULL);
static CV_PossibleValue_t addons_search_type_cons_t[] = {{0, "Start"}, {1, "Anywhere"}, {0, NULL}};
-consvar_t cv_addons_search_type = CVAR_INIT ("addons_search_type", "Anywhere", CV_SAVE, addons_search_type_cons_t, NULL);
+consvar_t cv_addons_search_type = CVAR_INIT ("addons_search_type", "Anywhere", NULL, CV_SAVE, addons_search_type_cons_t, NULL);
char menupath[1024];
size_t menupathindex[menudepth];
diff --git a/src/g_demo.c b/src/g_demo.c
index b92857a8924407ef7dcd46853b5ec0c19c85766b..22037456bfef4eb24675461c10534b8b8e0d673f 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -67,7 +67,7 @@ static UINT8 *metalbuffer = NULL;
static UINT8 *metal_p;
static UINT16 metalversion;
-consvar_t cv_resyncdemo = CVAR_INIT("resyncdemo", "On", 0, CV_OnOff, NULL);
+consvar_t cv_resyncdemo = CVAR_INIT("resyncdemo", "On", NULL, 0, CV_OnOff, NULL);
// extra data stuff (events registered this frame while recording)
static struct {
diff --git a/src/g_game.c b/src/g_game.c
index 1c186ae03149780b254c72f5243ed3d551350e52..4fd9c6aa7f5c23acf7b215cfb11d0f7243a82825 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -287,105 +287,96 @@ static CV_PossibleValue_t joyaxis_cons_t[] = {{0, "None"},
// don't mind me putting these here, I was lazy to figure out where else I could put those without blowing up the compiler.
-// it automatically becomes compact with 20+ players, but if you like it, I guess you can turn that on!
-consvar_t cv_compactscoreboard= CVAR_INIT ("compactscoreboard", "Off", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_compactscoreboard= CVAR_INIT ("compactscoreboard", "Off", "If on, always display the scoreboard in a compact format", CV_SAVE, CV_OnOff, NULL);
-// chat timer thingy
static CV_PossibleValue_t chattime_cons_t[] = {{5, "MIN"}, {999, "MAX"}, {0, NULL}};
-consvar_t cv_chattime = CVAR_INIT ("chattime", "8", CV_SAVE, chattime_cons_t, NULL);
+consvar_t cv_chattime = CVAR_INIT ("chattime", "8", "How long chat messages will remain before fading away", CV_SAVE, chattime_cons_t, NULL);
-// chatwidth
static CV_PossibleValue_t chatwidth_cons_t[] = {{64, "MIN"}, {300, "MAX"}, {0, NULL}};
-consvar_t cv_chatwidth = CVAR_INIT ("chatwidth", "150", CV_SAVE, chatwidth_cons_t, NULL);
+consvar_t cv_chatwidth = CVAR_INIT ("chatwidth", "150", "Width, in pixels, of the chat window", CV_SAVE, chatwidth_cons_t, NULL);
-// chatheight
static CV_PossibleValue_t chatheight_cons_t[] = {{6, "MIN"}, {22, "MAX"}, {0, NULL}};
-consvar_t cv_chatheight= CVAR_INIT ("chatheight", "8", CV_SAVE, chatheight_cons_t, NULL);
+consvar_t cv_chatheight= CVAR_INIT ("chatheight", "8", "Height, in lines, of the chat window", CV_SAVE, chatheight_cons_t, NULL);
-// chat notifications (do you want to hear beeps? I'd understand if you didn't.)
-consvar_t cv_chatnotifications= CVAR_INIT ("chatnotifications", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_chatnotifications= CVAR_INIT ("chatnotifications", "On", "Play a notification sound when a chat message is sent", CV_SAVE, CV_OnOff, NULL);
-// chat spam protection (why would you want to disable that???)
-consvar_t cv_chatspamprotection= CVAR_INIT ("chatspamprotection", "On", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
-consvar_t cv_chatspamspeed= CVAR_INIT ("chatspamspeed", "35", CV_SAVE|CV_NETVAR, CV_Unsigned, NULL);
-consvar_t cv_chatspamburst= CVAR_INIT ("chatspamburst", "3", CV_SAVE|CV_NETVAR, CV_Unsigned, NULL);
+consvar_t cv_chatspamprotection= CVAR_INIT ("chatspamprotection", "On", "Filter excessive messages from a player", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
+consvar_t cv_chatspamspeed= CVAR_INIT ("chatspamspeed", "35", "The frequency, in tics, a player is allowed to send messages in before being filtered", CV_SAVE|CV_NETVAR, CV_Unsigned, NULL);
+consvar_t cv_chatspamburst= CVAR_INIT ("chatspamburst", "3", "The amount of messages a player is allowed to send in bursts before being filtered", CV_SAVE|CV_NETVAR, CV_Unsigned, NULL);
-// minichat text background
-consvar_t cv_chatbacktint = CVAR_INIT ("chatbacktint", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_chatbacktint = CVAR_INIT ("chatbacktint", "On", "Adds a background color on chat messages", CV_SAVE, CV_OnOff, NULL);
-// old shit console chat. (mostly exists for stuff like terminal, not because I cared if anyone liked the old chat.)
static CV_PossibleValue_t consolechat_cons_t[] = {{0, "Window"}, {1, "Console"}, {2, "Window (Hidden)"}, {0, NULL}};
-consvar_t cv_consolechat = CVAR_INIT ("chatmode", "Window", CV_SAVE, consolechat_cons_t, NULL);
+consvar_t cv_consolechat = CVAR_INIT ("chatmode", "Window", "How chat is presented to the user", CV_SAVE, consolechat_cons_t, NULL);
-// Pause game upon window losing focus
-consvar_t cv_pauseifunfocused = CVAR_INIT ("pauseifunfocused", "Yes", CV_SAVE, CV_YesNo, NULL);
+consvar_t cv_pauseifunfocused = CVAR_INIT ("pauseifunfocused", "Yes", "Automatically pause the game in singleplayer if window focus is lost", CV_SAVE, CV_YesNo, NULL);
-consvar_t cv_instantretry = CVAR_INIT ("instantretry", "No", CV_SAVE, CV_YesNo, NULL);
+consvar_t cv_instantretry = CVAR_INIT ("instantretry", "No", NULL, CV_SAVE, CV_YesNo, NULL);
-consvar_t cv_crosshair = CVAR_INIT ("crosshair", "Cross", CV_SAVE, crosshair_cons_t, NULL);
-consvar_t cv_crosshair2 = CVAR_INIT ("crosshair2", "Cross", CV_SAVE, crosshair_cons_t, NULL);
-consvar_t cv_invertmouse = CVAR_INIT ("invertmouse", "Off", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_alwaysfreelook = CVAR_INIT ("alwaysmlook", "On", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_invertmouse2 = CVAR_INIT ("invertmouse2", "Off", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_alwaysfreelook2 = CVAR_INIT ("alwaysmlook2", "On", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_chasefreelook = CVAR_INIT ("chasemlook", "Off", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_chasefreelook2 = CVAR_INIT ("chasemlook2", "Off", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_mousemove = CVAR_INIT ("mousemove", "Off", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_mousemove2 = CVAR_INIT ("mousemove2", "Off", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_crosshair = CVAR_INIT ("crosshair", "Cross", "What crosshair to use in first-person", CV_SAVE, crosshair_cons_t, NULL);
+consvar_t cv_crosshair2 = CVAR_INIT ("crosshair2", "Cross", "What crosshair to use in first-person for player 2", CV_SAVE, crosshair_cons_t, NULL);
+consvar_t cv_invertmouse = CVAR_INIT ("invertmouse", "Off", "If mouse input should be inverted", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_invertmouse2 = CVAR_INIT ("invertmouse2", "Off", "If mouse input should be inverted for player 2", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_alwaysfreelook = CVAR_INIT ("alwaysmlook", "On", "Allow looking vertically with the mouse", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_alwaysfreelook2 = CVAR_INIT ("alwaysmlook2", "On", "Allow looking vertically with the mouse for player 2", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_chasefreelook = CVAR_INIT ("chasemlook", "Off", NULL, CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_chasefreelook2 = CVAR_INIT ("chasemlook2", "Off", NULL, CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_mousemove = CVAR_INIT ("mousemove", "Off", "If enabled, vertical mouse movement will move the character", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_mousemove2 = CVAR_INIT ("mousemove2", "Off", "If enabled, vertical mouse movement will move the character for player 2", CV_SAVE, CV_OnOff, NULL);
// previously "analog", "analog2", "useranalog", and "useranalog2", invalidating 2.1-era copies of config.cfg
// changed because it'd be nice to see people try out our actually good controls with gamepads now autobrake exists
consvar_t cv_analog[2] = {
- CVAR_INIT ("sessionanalog", "Off", CV_CALL|CV_NOSHOWHELP, CV_OnOff, Analog_OnChange),
- CVAR_INIT ("sessionanalog2", "Off", CV_CALL|CV_NOSHOWHELP, CV_OnOff, Analog2_OnChange),
+ CVAR_INIT ("sessionanalog", "Off", NULL, CV_CALL|CV_NOSHOWHELP, CV_OnOff, Analog_OnChange),
+ CVAR_INIT ("sessionanalog2", "Off", NULL, CV_CALL|CV_NOSHOWHELP, CV_OnOff, Analog2_OnChange),
};
consvar_t cv_useranalog[2] = {
- CVAR_INIT ("configanalog", "On", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog_OnChange),
- CVAR_INIT ("configanalog2", "On", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog2_OnChange),
+ CVAR_INIT ("configanalog", "On", NULL, CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog_OnChange),
+ CVAR_INIT ("configanalog2", "On", NULL, CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog2_OnChange),
};
// deez New User eXperiences
static CV_PossibleValue_t directionchar_cons_t[] = {{0, "Camera"}, {1, "Movement"}, {2, "Simple Locked"}, {0, NULL}};
consvar_t cv_directionchar[2] = {
- CVAR_INIT ("directionchar", "Movement", CV_SAVE|CV_CALL, directionchar_cons_t, DirectionChar_OnChange),
- CVAR_INIT ("directionchar2", "Movement", CV_SAVE|CV_CALL, directionchar_cons_t, DirectionChar2_OnChange),
+ CVAR_INIT ("directionchar", "Movement", "How the character will look relative to the camera", CV_SAVE|CV_CALL, directionchar_cons_t, DirectionChar_OnChange),
+ CVAR_INIT ("directionchar2", "Movement", "How the character will look relative to the camera for playre 2", CV_SAVE|CV_CALL, directionchar_cons_t, DirectionChar2_OnChange),
};
-consvar_t cv_autobrake = CVAR_INIT ("autobrake", "On", CV_SAVE|CV_CALL, CV_OnOff, AutoBrake_OnChange);
-consvar_t cv_autobrake2 = CVAR_INIT ("autobrake2", "On", CV_SAVE|CV_CALL, CV_OnOff, AutoBrake2_OnChange);
+consvar_t cv_autobrake = CVAR_INIT ("autobrake", "On", "Automatically brake when no movement input is given", CV_SAVE|CV_CALL, CV_OnOff, AutoBrake_OnChange);
+consvar_t cv_autobrake2 = CVAR_INIT ("autobrake2", "On", "Automatically brake when no movement input is given for player 2", CV_SAVE|CV_CALL, CV_OnOff, AutoBrake2_OnChange);
// hi here's some new controls
static CV_PossibleValue_t zerotoone_cons_t[] = {{0, "MIN"}, {FRACUNIT, "MAX"}, {0, NULL}};
consvar_t cv_cam_shiftfacing[2] = {
- CVAR_INIT ("cam_shiftfacingchar", "0.375", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
- CVAR_INIT ("cam2_shiftfacingchar", "0.375", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam_shiftfacingchar", "0.375", NULL, CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam2_shiftfacingchar", "0.375", NULL, CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
};
consvar_t cv_cam_turnfacing[2] = {
- CVAR_INIT ("cam_turnfacingchar", "0.25", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
- CVAR_INIT ("cam2_turnfacingchar", "0.25", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam_turnfacingchar", "0.25", NULL, CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam2_turnfacingchar", "0.25", NULL, CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
};
consvar_t cv_cam_turnfacingability[2] = {
- CVAR_INIT ("cam_turnfacingability", "0.125", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
- CVAR_INIT ("cam2_turnfacingability", "0.125", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam_turnfacingability", "0.125", NULL, CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam2_turnfacingability", "0.125", NULL, CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
};
consvar_t cv_cam_turnfacingspindash[2] = {
- CVAR_INIT ("cam_turnfacingspindash", "0.25", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
- CVAR_INIT ("cam2_turnfacingspindash", "0.25", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam_turnfacingspindash", "0.25", NULL, CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam2_turnfacingspindash", "0.25", NULL, CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
};
consvar_t cv_cam_turnfacinginput[2] = {
- CVAR_INIT ("cam_turnfacinginput", "0.375", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
- CVAR_INIT ("cam2_turnfacinginput", "0.375", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam_turnfacinginput", "0.375", NULL, CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam2_turnfacinginput", "0.375", NULL, CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL),
};
static CV_PossibleValue_t centertoggle_cons_t[] = {{0, "Hold"}, {1, "Toggle"}, {2, "Sticky Hold"}, {0, NULL}};
consvar_t cv_cam_centertoggle[2] = {
- CVAR_INIT ("cam_centertoggle", "Hold", CV_SAVE|CV_ALLOWLUA, centertoggle_cons_t, NULL),
- CVAR_INIT ("cam2_centertoggle", "Hold", CV_SAVE|CV_ALLOWLUA, centertoggle_cons_t, NULL),
+ CVAR_INIT ("cam_centertoggle", "Hold", NULL, CV_SAVE|CV_ALLOWLUA, centertoggle_cons_t, NULL),
+ CVAR_INIT ("cam2_centertoggle", "Hold", NULL, CV_SAVE|CV_ALLOWLUA, centertoggle_cons_t, NULL),
};
static CV_PossibleValue_t lockedinput_cons_t[] = {{0, "Strafe"}, {1, "Turn"}, {0, NULL}};
consvar_t cv_cam_lockedinput[2] = {
- CVAR_INIT ("cam_lockedinput", "Strafe", CV_SAVE|CV_ALLOWLUA, lockedinput_cons_t, NULL),
- CVAR_INIT ("cam2_lockedinput", "Strafe", CV_SAVE|CV_ALLOWLUA, lockedinput_cons_t, NULL),
+ CVAR_INIT ("cam_lockedinput", "Strafe", NULL, CV_SAVE|CV_ALLOWLUA, lockedinput_cons_t, NULL),
+ CVAR_INIT ("cam2_lockedinput", "Strafe", NULL, CV_SAVE|CV_ALLOWLUA, lockedinput_cons_t, NULL),
};
static CV_PossibleValue_t lockedassist_cons_t[] = {
@@ -397,31 +388,31 @@ static CV_PossibleValue_t lockedassist_cons_t[] = {
{0, NULL}
};
consvar_t cv_cam_lockonboss[2] = {
- CVAR_INIT ("cam_lockaimassist", "Full", CV_SAVE|CV_ALLOWLUA, lockedassist_cons_t, NULL),
- CVAR_INIT ("cam2_lockaimassist", "Full", CV_SAVE|CV_ALLOWLUA, lockedassist_cons_t, NULL),
+ CVAR_INIT ("cam_lockaimassist", "Full", NULL, CV_SAVE|CV_ALLOWLUA, lockedassist_cons_t, NULL),
+ CVAR_INIT ("cam2_lockaimassist", "Full", NULL, CV_SAVE|CV_ALLOWLUA, lockedassist_cons_t, NULL),
};
-consvar_t cv_moveaxis = CVAR_INIT ("joyaxis_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL);
-consvar_t cv_sideaxis = CVAR_INIT ("joyaxis_side", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL);
-consvar_t cv_lookaxis = CVAR_INIT ("joyaxis_look", "X-Rudder-", CV_SAVE, joyaxis_cons_t, NULL);
-consvar_t cv_turnaxis = CVAR_INIT ("joyaxis_turn", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL);
-consvar_t cv_jumpaxis = CVAR_INIT ("joyaxis_jump", "None", CV_SAVE, joyaxis_cons_t, NULL);
-consvar_t cv_spinaxis = CVAR_INIT ("joyaxis_spin", "None", CV_SAVE, joyaxis_cons_t, NULL);
-consvar_t cv_fireaxis = CVAR_INIT ("joyaxis_fire", "Z-Rudder", CV_SAVE, joyaxis_cons_t, NULL);
-consvar_t cv_firenaxis = CVAR_INIT ("joyaxis_firenormal", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL);
-consvar_t cv_deadzone = CVAR_INIT ("joy_deadzone", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
-consvar_t cv_digitaldeadzone = CVAR_INIT ("joy_digdeadzone", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
-
-consvar_t cv_moveaxis2 = CVAR_INIT ("joyaxis2_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL);
-consvar_t cv_sideaxis2 = CVAR_INIT ("joyaxis2_side", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL);
-consvar_t cv_lookaxis2 = CVAR_INIT ("joyaxis2_look", "X-Rudder-", CV_SAVE, joyaxis_cons_t, NULL);
-consvar_t cv_turnaxis2 = CVAR_INIT ("joyaxis2_turn", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL);
-consvar_t cv_jumpaxis2 = CVAR_INIT ("joyaxis2_jump", "None", CV_SAVE, joyaxis_cons_t, NULL);
-consvar_t cv_spinaxis2 = CVAR_INIT ("joyaxis2_spin", "None", CV_SAVE, joyaxis_cons_t, NULL);
-consvar_t cv_fireaxis2 = CVAR_INIT ("joyaxis2_fire", "Z-Rudder", CV_SAVE, joyaxis_cons_t, NULL);
-consvar_t cv_firenaxis2 = CVAR_INIT ("joyaxis2_firenormal", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL);
-consvar_t cv_deadzone2 = CVAR_INIT ("joy_deadzone2", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
-consvar_t cv_digitaldeadzone2 = CVAR_INIT ("joy_digdeadzone2", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
+consvar_t cv_moveaxis = CVAR_INIT ("joyaxis_move", "Y-Axis", NULL, CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_sideaxis = CVAR_INIT ("joyaxis_side", "X-Axis", NULL, CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_lookaxis = CVAR_INIT ("joyaxis_look", "X-Rudder-", NULL, CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_turnaxis = CVAR_INIT ("joyaxis_turn", "Z-Axis", NULL, CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_jumpaxis = CVAR_INIT ("joyaxis_jump", "None", NULL, CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_spinaxis = CVAR_INIT ("joyaxis_spin", "None", NULL, CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_fireaxis = CVAR_INIT ("joyaxis_fire", "Z-Rudder", NULL, CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_firenaxis = CVAR_INIT ("joyaxis_firenormal", "Z-Axis", NULL, CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_deadzone = CVAR_INIT ("joy_deadzone", "0.125", NULL, CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
+consvar_t cv_digitaldeadzone = CVAR_INIT ("joy_digdeadzone", "0.25", NULL, CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
+
+consvar_t cv_moveaxis2 = CVAR_INIT ("joyaxis2_move", "Y-Axis", NULL, CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_sideaxis2 = CVAR_INIT ("joyaxis2_side", "X-Axis", NULL, CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_lookaxis2 = CVAR_INIT ("joyaxis2_look", "X-Rudder-", NULL, CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_turnaxis2 = CVAR_INIT ("joyaxis2_turn", "Z-Axis", NULL, CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_jumpaxis2 = CVAR_INIT ("joyaxis2_jump", "None", NULL, CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_spinaxis2 = CVAR_INIT ("joyaxis2_spin", "None", NULL, CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_fireaxis2 = CVAR_INIT ("joyaxis2_fire", "Z-Rudder", NULL, CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_firenaxis2 = CVAR_INIT ("joyaxis2_firenormal", "Z-Axis", NULL, CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_deadzone2 = CVAR_INIT ("joy_deadzone2", "0.125", NULL, CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
+consvar_t cv_digitaldeadzone2 = CVAR_INIT ("joy_digdeadzone2", "0.25", NULL, CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
player_t *seenplayer; // player we're aiming at right now
diff --git a/src/g_input.c b/src/g_input.c
index 4fbdf5e7586d41c4dd09f0a5e5c3e2aafa67c99d..9b9257a12faf38f00bb29a0458abc44359da017a 100644
--- a/src/g_input.c
+++ b/src/g_input.c
@@ -27,11 +27,11 @@ static CV_PossibleValue_t mousesens_cons_t[] = {{1, "MIN"}, {MAXMOUSESENSITIVITY
static CV_PossibleValue_t onecontrolperkey_cons_t[] = {{1, "One"}, {2, "Several"}, {0, NULL}};
// mouse values are used once
-consvar_t cv_mousesens = CVAR_INIT ("mousesens", "20", CV_SAVE, mousesens_cons_t, NULL);
-consvar_t cv_mousesens2 = CVAR_INIT ("mousesens2", "20", CV_SAVE, mousesens_cons_t, NULL);
-consvar_t cv_mouseysens = CVAR_INIT ("mouseysens", "20", CV_SAVE, mousesens_cons_t, NULL);
-consvar_t cv_mouseysens2 = CVAR_INIT ("mouseysens2", "20", CV_SAVE, mousesens_cons_t, NULL);
-consvar_t cv_controlperkey = CVAR_INIT ("controlperkey", "One", CV_SAVE, onecontrolperkey_cons_t, NULL);
+consvar_t cv_mousesens = CVAR_INIT ("mousesens", "20", "Mouse X sensitivity", CV_SAVE, mousesens_cons_t, NULL);
+consvar_t cv_mousesens2 = CVAR_INIT ("mousesens2", "20", "Mouse X sensitivity for player 2", CV_SAVE, mousesens_cons_t, NULL);
+consvar_t cv_mouseysens = CVAR_INIT ("mouseysens", "20", "Mouse Y sensitivity", CV_SAVE, mousesens_cons_t, NULL);
+consvar_t cv_mouseysens2 = CVAR_INIT ("mouseysens2", "20", "Mouse Y sensitivity for player 2", CV_SAVE, mousesens_cons_t, NULL);
+consvar_t cv_controlperkey = CVAR_INIT ("controlperkey", "One", "If set to Multiple, overlapping binds are allowed", CV_SAVE, onecontrolperkey_cons_t, NULL);
mouse_t mouse;
mouse_t mouse2;
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 26987d2c058ccb7332969acf08db23a4a6faff0e..13411ecc913058ec614b23c51ed32d15b05af55b 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -5679,39 +5679,39 @@ static CV_PossibleValue_t glfiltermode_cons_t[]= {{HWD_SET_TEXTUREFILTER_POINTSA
{0, NULL}};
CV_PossibleValue_t glanisotropicmode_cons_t[] = {{1, "MIN"}, {16, "MAX"}, {0, NULL}};
-consvar_t cv_glshaders = CVAR_INIT ("gr_shaders", "On", CV_SAVE|CV_CALL, glshaders_cons_t, CV_glshaders_OnChange);
+consvar_t cv_glshaders = CVAR_INIT ("gr_shaders", "On", "Enables OpenGL shaders", CV_SAVE|CV_CALL, glshaders_cons_t, CV_glshaders_OnChange);
#ifdef ALAM_LIGHTING
-consvar_t cv_gldynamiclighting = CVAR_INIT ("gr_dynamiclighting", "On", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_glstaticlighting = CVAR_INIT ("gr_staticlighting", "On", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_glcoronas = CVAR_INIT ("gr_coronas", "On", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_glcoronasize = CVAR_INIT ("gr_coronasize", "1", CV_SAVE|CV_FLOAT, 0, NULL);
+consvar_t cv_gldynamiclighting = CVAR_INIT ("gr_dynamiclighting", "On", NULL, CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_glstaticlighting = CVAR_INIT ("gr_staticlighting", "On", NULL, CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_glcoronas = CVAR_INIT ("gr_coronas", "On", NULL, CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_glcoronasize = CVAR_INIT ("gr_coronasize", "1", NULL, CV_SAVE|CV_FLOAT, 0, NULL);
#endif
-consvar_t cv_glmodels = CVAR_INIT ("gr_models", "Off", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_glmodelinterpolation = CVAR_INIT ("gr_modelinterpolation", "On", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_glmodellighting = CVAR_INIT ("gr_modellighting", "Off", CV_SAVE|CV_CALL, CV_OnOff, CV_glmodellighting_OnChange);
+consvar_t cv_glmodels = CVAR_INIT ("gr_models", "Off", "If on, will use 3D models instead of sprites if available", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_glmodelinterpolation = CVAR_INIT ("gr_modelinterpolation", "On", "If on, 3D models will interpolate on between frames", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_glmodellighting = CVAR_INIT ("gr_modellighting", "Off", NULL, CV_SAVE|CV_CALL, CV_OnOff, CV_glmodellighting_OnChange);
-consvar_t cv_glshearing = CVAR_INIT ("gr_shearing", "Off", CV_SAVE, glshearing_cons_t, NULL);
-consvar_t cv_glspritebillboarding = CVAR_INIT ("gr_spritebillboarding", "Off", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_glskydome = CVAR_INIT ("gr_skydome", "On", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_glfakecontrast = CVAR_INIT ("gr_fakecontrast", "Smooth", CV_SAVE, glfakecontrast_cons_t, NULL);
-consvar_t cv_glslopecontrast = CVAR_INIT ("gr_slopecontrast", "Off", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_glshearing = CVAR_INIT ("gr_shearing", "Off", "Emulates Software's vertical look", CV_SAVE, glshearing_cons_t, NULL);
+consvar_t cv_glspritebillboarding = CVAR_INIT ("gr_spritebillboarding", "Off", "Causes sprites to always face the camera", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_glskydome = CVAR_INIT ("gr_skydome", "On", "Bend skybox around the map, giving a higher skybox quality", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_glfakecontrast = CVAR_INIT ("gr_fakecontrast", "Smooth", NULL, CV_SAVE, glfakecontrast_cons_t, NULL);
+consvar_t cv_glslopecontrast = CVAR_INIT ("gr_slopecontrast", "Off", NULL, CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_glfiltermode = CVAR_INIT ("gr_filtermode", "Nearest", CV_SAVE|CV_CALL, glfiltermode_cons_t, CV_glfiltermode_OnChange);
-consvar_t cv_glanisotropicmode = CVAR_INIT ("gr_anisotropicmode", "1", CV_SAVE|CV_CALL, glanisotropicmode_cons_t, CV_glanisotropic_OnChange);
+consvar_t cv_glfiltermode = CVAR_INIT ("gr_filtermode", "Nearest", "Texture filter to use when scaling", CV_SAVE|CV_CALL, glfiltermode_cons_t, CV_glfiltermode_OnChange);
+consvar_t cv_glanisotropicmode = CVAR_INIT ("gr_anisotropicmode", "1", NULL, CV_SAVE|CV_CALL, glanisotropicmode_cons_t, CV_glanisotropic_OnChange);
-consvar_t cv_glsolvetjoin = CVAR_INIT ("gr_solvetjoin", "On", 0, CV_OnOff, NULL);
+consvar_t cv_glsolvetjoin = CVAR_INIT ("gr_solvetjoin", "On", NULL, 0, CV_OnOff, NULL);
-consvar_t cv_glbatching = CVAR_INIT ("gr_batching", "On", 0, CV_OnOff, NULL);
+consvar_t cv_glbatching = CVAR_INIT ("gr_batching", "On", "Whetever to send polygons in batches to the GPU or not", 0, CV_OnOff, NULL);
static CV_PossibleValue_t glpalettedepth_cons_t[] = {{16, "16 bits"}, {24, "24 bits"}, {0, NULL}};
-consvar_t cv_glpaletterendering = CVAR_INIT ("gr_paletterendering", "On", CV_SAVE|CV_CALL, CV_OnOff, CV_glpaletterendering_OnChange);
-consvar_t cv_glpalettedepth = CVAR_INIT ("gr_palettedepth", "16 bits", CV_SAVE|CV_CALL, glpalettedepth_cons_t, CV_glpalettedepth_OnChange);
+consvar_t cv_glpaletterendering = CVAR_INIT ("gr_paletterendering", "On", "Emulate Software's color paletting", CV_SAVE|CV_CALL, CV_OnOff, CV_glpaletterendering_OnChange);
+consvar_t cv_glpalettedepth = CVAR_INIT ("gr_palettedepth", "16 bits", NULL, CV_SAVE|CV_CALL, glpalettedepth_cons_t, CV_glpalettedepth_OnChange);
#define ONLY_IF_GL_LOADED if (vid.glstate != VID_GL_LIBRARY_LOADED) return;
-consvar_t cv_glwireframe = CVAR_INIT ("gr_wireframe", "Off", 0, CV_OnOff, NULL);
+consvar_t cv_glwireframe = CVAR_INIT ("gr_wireframe", "Off", "When combined with devmode, will render the world with lines instead, revealing how polygons are split and rendered", 0, CV_OnOff, NULL);
static void CV_glfiltermode_OnChange(void)
{
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 3adfe4656f8516b1ee973e9b2eca43dafa0a9b0c..9ca832b9c7a6c7b21ab9309f49793eb485ae97f9 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -110,7 +110,7 @@ static patch_t *nopingicon;
// crosshair 0 = off, 1 = cross, 2 = angle, 3 = point, see m_menu.c
static patch_t *crosshair[HU_CROSSHAIRS]; // 3 precached crosshair graphics
-static consvar_t cv_showprivatemessages = CVAR_INIT ("hu_showprivatemessages", "Off", CV_SAVE, CV_OnOff, NULL);
+static consvar_t cv_showprivatemessages = CVAR_INIT ("hu_showprivatemessages", "Off", "If on, private messages will be logged on the server", CV_SAVE, CV_OnOff, NULL);
// -------
// protos.
@@ -294,10 +294,10 @@ void HU_SetFontProperties(fontdef_t *font, INT32 kerning, UINT32 spacewidth, UIN
//
void HU_Init(void)
{
- COM_AddCommand("say", Command_Say_f, COM_LUA);
- COM_AddCommand("sayto", Command_Sayto_f, COM_LUA);
- COM_AddCommand("sayteam", Command_Sayteam_f, COM_LUA);
- COM_AddCommand("csay", Command_CSay_f, COM_LUA);
+ COM_AddCommand("say", "Send a message in chat", Command_Say_f, COM_LUA);
+ COM_AddCommand("sayto", "Send a private message to someone; be warned that these are still broadcasted!", Command_Sayto_f, COM_LUA);
+ COM_AddCommand("sayteam", "Send a message to your team", Command_Sayteam_f, COM_LUA);
+ COM_AddCommand("csay", "Show a text message on-screen for all players", Command_CSay_f, COM_LUA);
CV_RegisterVar(&cv_showprivatemessages);
RegisterNetXCmd(XD_SAY, Got_Saycmd);
diff --git a/src/i_time.c b/src/i_time.c
index 39854b242db15dae5b89c634a938783e35691df2..54b61605bffad6f93b3f565e4175d51189e9b6dc 100644
--- a/src/i_time.c
+++ b/src/i_time.c
@@ -24,7 +24,7 @@
timestate_t g_time;
static CV_PossibleValue_t timescale_cons_t[] = {{FRACUNIT/20, "MIN"}, {20*FRACUNIT, "MAX"}, {0, NULL}};
-consvar_t cv_timescale = CVAR_INIT ("timescale", "1.0", CV_NETVAR|CV_CHEAT|CV_FLOAT, timescale_cons_t, NULL);
+consvar_t cv_timescale = CVAR_INIT ("timescale", "1.0", "Multiplier for ticrate, will speed up the game when increased", CV_NETVAR|CV_CHEAT|CV_FLOAT, timescale_cons_t, NULL);
static precise_t enterprecise, oldenterprecise;
static fixed_t entertic, oldentertics;
diff --git a/src/lua_consolelib.c b/src/lua_consolelib.c
index b9b24307b0127b41fe0050106c4447ac5d3f7d55..eb0b0108cb7e6e9ac4acb510f99ea349664dd35e 100644
--- a/src/lua_consolelib.c
+++ b/src/lua_consolelib.c
@@ -209,19 +209,27 @@ void COM_Lua_f(void)
static int lib_comAddCommand(lua_State *L)
{
int com_return = -1;
+ int argoff = 2;
const char *luaname = luaL_checkstring(L, 1);
// must store in all lowercase
+ const char *desc = NULL;
char *name = Z_StrDup(luaname);
strlwr(name);
- luaL_checktype(L, 2, LUA_TFUNCTION);
+ if (lua_isstring(L, 2))
+ {
+ desc = luaL_checkstring(L, 2);
+ argoff = 3;
+ }
+
+ luaL_checktype(L, argoff, LUA_TFUNCTION);
NOHOOK
- if (lua_gettop(L) >= 3)
+ if (lua_gettop(L) >= argoff + 1)
{ // For the third argument, only take a boolean or a number.
- lua_settop(L, 3);
+ lua_settop(L, argoff + 1);
// TODO: 2.3: Remove boolean option
- if (lua_type(L, 3) == LUA_TBOOLEAN)
+ if (lua_type(L, argoff + 1) == LUA_TBOOLEAN)
{
CONS_Alert(CONS_WARNING,
"Using a boolean for admin commands is "
@@ -230,11 +238,11 @@ static int lib_comAddCommand(lua_State *L)
);
}
else
- luaL_checktype(L, 3, LUA_TNUMBER);
+ luaL_checktype(L, argoff + 1, LUA_TNUMBER);
}
else
{ // No third argument? Default to 0.
- lua_settop(L, 2);
+ lua_settop(L, argoff);
lua_pushinteger(L, 0);
}
@@ -250,7 +258,7 @@ static int lib_comAddCommand(lua_State *L)
lua_setfield(L, -2, name);
// Try to add the Lua command
- com_return = COM_AddLuaCommand(name);
+ com_return = COM_AddLuaCommand(name, desc);
if (com_return < 0)
{ // failed to add -- free the lowercased name and return error
@@ -388,6 +396,14 @@ static int lib_cvRegisterVar(lua_State *L)
}
cvar->name = Z_StrDup(lua_tostring(L, 4));
}
+ else if ((k && fasticmp(k, "desc")))
+ {
+ if (!lua_isstring(L, 4))
+ {
+ TYPEERROR("desc", LUA_TSTRING)
+ }
+ cvar->desc = Z_StrDup(lua_tostring(L, 4));
+ }
else if (i == 2 || (k && fasticmp(k, "defaultvalue")))
{
if (!lua_isstring(L, 4))
diff --git a/src/m_anigif.c b/src/m_anigif.c
index 39e64a2bff69e7cc761d0f1ae04010acad1178bb..d7edaa4940af12f0f3aae2316bf9979ad176741f 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -36,10 +36,10 @@ CV_PossibleValue_t gif_dynamicdelay_cons_t[] = {
{2, "Accurate, experimental"},
{0, NULL}};
-consvar_t cv_gif_optimize = CVAR_INIT ("gif_optimize", "On", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_gif_downscale = CVAR_INIT ("gif_downscale", "On", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_gif_dynamicdelay = CVAR_INIT ("gif_dynamicdelay", "On", CV_SAVE, gif_dynamicdelay_cons_t, NULL);
-consvar_t cv_gif_localcolortable = CVAR_INIT ("gif_localcolortable", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_gif_optimize = CVAR_INIT ("gif_optimize", "On", "If on, try to filter out duplicate pixels in GIF recordings to reduce size", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_gif_downscale = CVAR_INIT ("gif_downscale", "On", "If on, scale down the GIF recording to 320x200", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_gif_dynamicdelay = CVAR_INIT ("gif_dynamicdelay", "On", NULL, CV_SAVE, gif_dynamicdelay_cons_t, NULL);
+consvar_t cv_gif_localcolortable = CVAR_INIT ("gif_localcolortable", "On", NULL, CV_SAVE, CV_OnOff, NULL);
#ifdef HAVE_ANIGIF
static boolean gif_optimize = false; // So nobody can do something dumb
diff --git a/src/m_cheat.c b/src/m_cheat.c
index 21ecc3312f2c5fa82f865600518d2863589ca986..b4f418397c60ab92ecea86c477ec4a8f89f9374f 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -961,10 +961,10 @@ static CV_PossibleValue_t op_speed_t[] = {{1, "MIN"}, {128, "MAX"}, {0, NULL}};
static CV_PossibleValue_t op_flags_t[] = {{0, "MIN"}, {15, "MAX"}, {0, NULL}};
static CV_PossibleValue_t op_hoopflags_t[] = {{0, "MIN"}, {15, "MAX"}, {0, NULL}};
-consvar_t cv_mapthingnum = CVAR_INIT ("op_mapthingnum", "0", CV_NOTINNET, op_mapthing_t, NULL);
-consvar_t cv_speed = CVAR_INIT ("op_speed", "16", CV_NOTINNET, op_speed_t, NULL);
-consvar_t cv_opflags = CVAR_INIT ("op_flags", "0", CV_NOTINNET, op_flags_t, NULL);
-consvar_t cv_ophoopflags = CVAR_INIT ("op_hoopflags", "4", CV_NOTINNET, op_hoopflags_t, NULL);
+consvar_t cv_mapthingnum = CVAR_INIT ("op_mapthingnum", "0", NULL, CV_NOTINNET, op_mapthing_t, NULL);
+consvar_t cv_speed = CVAR_INIT ("op_speed", "16", NULL, CV_NOTINNET, op_speed_t, NULL);
+consvar_t cv_opflags = CVAR_INIT ("op_flags", "0", NULL, CV_NOTINNET, op_flags_t, NULL);
+consvar_t cv_ophoopflags = CVAR_INIT ("op_hoopflags", "4", NULL, CV_NOTINNET, op_hoopflags_t, NULL);
boolean objectplacing = false;
mobjtype_t op_currentthing = 0; // For the object placement mode
diff --git a/src/m_menu.c b/src/m_menu.c
index 87b9c5c435c053cbbdc18747f510f35f5bb9d17b..813dac61f7859e3f5591b555a61a350b2a86507a 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -416,23 +416,23 @@ static void Dummymares_OnChange(void);
// CONSOLE VARIABLES AND THEIR POSSIBLE VALUES GO HERE.
// ==========================================================================
-consvar_t cv_showfocuslost = CVAR_INIT ("showfocuslost", "Yes", CV_SAVE, CV_YesNo, NULL);
+consvar_t cv_showfocuslost = CVAR_INIT ("showfocuslost", "Yes", "Show a \"focus lost\" popup when the game is in the background", CV_SAVE, CV_YesNo, NULL);
static CV_PossibleValue_t map_cons_t[] = {
{1,"MIN"},
{NUMMAPS, "MAX"},
{0,NULL}
};
-consvar_t cv_nextmap = CVAR_INIT ("nextmap", "1", CV_HIDEN|CV_CALL, map_cons_t, Nextmap_OnChange);
+consvar_t cv_nextmap = CVAR_INIT ("nextmap", "1", NULL, CV_HIDEN|CV_CALL, map_cons_t, Nextmap_OnChange);
static CV_PossibleValue_t skins_cons_t[MAXSKINS+1] = {{1, DEFAULTSKIN}};
-consvar_t cv_chooseskin = CVAR_INIT ("chooseskin", DEFAULTSKIN, CV_HIDEN|CV_CALL, skins_cons_t, Nextmap_OnChange);
+consvar_t cv_chooseskin = CVAR_INIT ("chooseskin", DEFAULTSKIN, NULL, CV_HIDEN|CV_CALL, skins_cons_t, Nextmap_OnChange);
// This gametype list is integral for many different reasons.
// When you add gametypes here, don't forget to update them in deh_tables.c and doomstat.h!
CV_PossibleValue_t gametype_cons_t[NUMGAMETYPES+1];
-consvar_t cv_newgametype = CVAR_INIT ("newgametype", "Co-op", CV_HIDEN|CV_CALL, gametype_cons_t, Newgametype_OnChange);
+consvar_t cv_newgametype = CVAR_INIT ("newgametype", "Co-op", NULL, CV_HIDEN|CV_CALL, gametype_cons_t, Newgametype_OnChange);
static CV_PossibleValue_t serversort_cons_t[] = {
{0,"Ping"},
@@ -443,22 +443,22 @@ static CV_PossibleValue_t serversort_cons_t[] = {
{5,"Gametype"},
{0,NULL}
};
-consvar_t cv_serversort = CVAR_INIT ("serversort", "Ping", CV_HIDEN | CV_CALL, serversort_cons_t, M_SortServerList);
+consvar_t cv_serversort = CVAR_INIT ("serversort", "Ping", NULL, CV_HIDEN | CV_CALL, serversort_cons_t, M_SortServerList);
// first time memory
-consvar_t cv_tutorialprompt = CVAR_INIT ("tutorialprompt", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_tutorialprompt = CVAR_INIT ("tutorialprompt", "On", NULL, CV_SAVE, CV_OnOff, NULL);
// autorecord demos for time attack
-static consvar_t cv_autorecord = CVAR_INIT ("autorecord", "Yes", 0, CV_YesNo, NULL);
+static consvar_t cv_autorecord = CVAR_INIT ("autorecord", "Yes", NULL, 0, CV_YesNo, NULL);
CV_PossibleValue_t ghost_cons_t[] = {{0, "Hide"}, {1, "Show"}, {2, "Show All"}, {0, NULL}};
CV_PossibleValue_t ghost2_cons_t[] = {{0, "Hide"}, {1, "Show"}, {0, NULL}};
-consvar_t cv_ghost_bestscore = CVAR_INIT ("ghost_bestscore", "Show", CV_SAVE, ghost_cons_t, NULL);
-consvar_t cv_ghost_besttime = CVAR_INIT ("ghost_besttime", "Show", CV_SAVE, ghost_cons_t, NULL);
-consvar_t cv_ghost_bestrings = CVAR_INIT ("ghost_bestrings", "Show", CV_SAVE, ghost_cons_t, NULL);
-consvar_t cv_ghost_last = CVAR_INIT ("ghost_last", "Show", CV_SAVE, ghost_cons_t, NULL);
-consvar_t cv_ghost_guest = CVAR_INIT ("ghost_guest", "Show", CV_SAVE, ghost2_cons_t, NULL);
+consvar_t cv_ghost_bestscore = CVAR_INIT ("ghost_bestscore", "Show", NULL, CV_SAVE, ghost_cons_t, NULL);
+consvar_t cv_ghost_besttime = CVAR_INIT ("ghost_besttime", "Show", NULL, CV_SAVE, ghost_cons_t, NULL);
+consvar_t cv_ghost_bestrings = CVAR_INIT ("ghost_bestrings", "Show", NULL, CV_SAVE, ghost_cons_t, NULL);
+consvar_t cv_ghost_last = CVAR_INIT ("ghost_last", "Show", NULL, CV_SAVE, ghost_cons_t, NULL);
+consvar_t cv_ghost_guest = CVAR_INIT ("ghost_guest", "Show", NULL, CV_SAVE, ghost2_cons_t, NULL);
//Console variables used solely in the menu system.
//todo: add a way to use non-console variables in the menu
@@ -472,19 +472,19 @@ static CV_PossibleValue_t dummymares_cons_t[] = {
{-1, "END"}, {0,"Overall"}, {1,"Mare 1"}, {2,"Mare 2"}, {3,"Mare 3"}, {4,"Mare 4"}, {5,"Mare 5"}, {6,"Mare 6"}, {7,"Mare 7"}, {8,"Mare 8"}, {0,NULL}
};
-static consvar_t cv_dummyteam = CVAR_INIT ("dummyteam", "Spectator", CV_HIDEN, dummyteam_cons_t, NULL);
-static consvar_t cv_dummyscramble = CVAR_INIT ("dummyscramble", "Random", CV_HIDEN, dummyscramble_cons_t, NULL);
-static consvar_t cv_dummyrings = CVAR_INIT ("dummyrings", "0", CV_HIDEN, ringlimit_cons_t, NULL);
-static consvar_t cv_dummylives = CVAR_INIT ("dummylives", "0", CV_HIDEN, liveslimit_cons_t, NULL);
-static consvar_t cv_dummycontinues = CVAR_INIT ("dummycontinues", "0", CV_HIDEN, contlimit_cons_t, NULL);
-static consvar_t cv_dummymares = CVAR_INIT ("dummymares", "Overall", CV_HIDEN|CV_CALL, dummymares_cons_t, Dummymares_OnChange);
+static consvar_t cv_dummyteam = CVAR_INIT ("dummyteam", "Spectator", NULL, CV_HIDEN, dummyteam_cons_t, NULL);
+static consvar_t cv_dummyscramble = CVAR_INIT ("dummyscramble", "Random", NULL, CV_HIDEN, dummyscramble_cons_t, NULL);
+static consvar_t cv_dummyrings = CVAR_INIT ("dummyrings", "0", NULL, CV_HIDEN, ringlimit_cons_t, NULL);
+static consvar_t cv_dummylives = CVAR_INIT ("dummylives", "0", NULL, CV_HIDEN, liveslimit_cons_t, NULL);
+static consvar_t cv_dummycontinues = CVAR_INIT ("dummycontinues", "0", NULL, CV_HIDEN, contlimit_cons_t, NULL);
+static consvar_t cv_dummymares = CVAR_INIT ("dummymares", "Overall", NULL, CV_HIDEN|CV_CALL, dummymares_cons_t, Dummymares_OnChange);
CV_PossibleValue_t marathon_cons_t[] = {{0, "Standard"}, {1, "Live Event Backup"}, {2, "Ultimate"}, {0, NULL}};
CV_PossibleValue_t loadless_cons_t[] = {{0, "Realtime"}, {1, "In-game"}, {0, NULL}};
-consvar_t cv_dummymarathon = CVAR_INIT ("dummymarathon", "Standard", CV_HIDEN, marathon_cons_t, NULL);
-consvar_t cv_dummycutscenes = CVAR_INIT ("dummycutscenes", "Off", CV_HIDEN, CV_OnOff, NULL);
-consvar_t cv_dummyloadless = CVAR_INIT ("dummyloadless", "In-game", CV_HIDEN, loadless_cons_t, NULL);
+consvar_t cv_dummymarathon = CVAR_INIT ("dummymarathon", "Standard", NULL, CV_HIDEN, marathon_cons_t, NULL);
+consvar_t cv_dummycutscenes = CVAR_INIT ("dummycutscenes", "Off", NULL, CV_HIDEN, CV_OnOff, NULL);
+consvar_t cv_dummyloadless = CVAR_INIT ("dummyloadless", "In-game", NULL, CV_HIDEN, loadless_cons_t, NULL);
// ==========================================================================
// ORGANIZATION START.
@@ -3914,7 +3914,7 @@ void M_Init(void)
{
int i;
- COM_AddCommand("manual", Command_Manual_f, COM_LUA);
+ COM_AddCommand("manual", NULL, Command_Manual_f, COM_LUA);
CV_RegisterVar(&cv_nextmap);
CV_RegisterVar(&cv_newgametype);
diff --git a/src/m_misc.c b/src/m_misc.c
index 24616e9db42e2b27bab8c4d359e5d92b3945f6d7..fe3d2dacf31e5fe35d756cb0df8ed19ff8851c6e 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -102,16 +102,16 @@ typedef off_t off64_t;
#endif
static CV_PossibleValue_t screenshot_cons_t[] = {{0, "Default"}, {1, "HOME"}, {2, "SRB2"}, {3, "CUSTOM"}, {0, NULL}};
-consvar_t cv_screenshot_option = CVAR_INIT ("screenshot_option", "Default", CV_SAVE|CV_CALL, screenshot_cons_t, Screenshot_option_Onchange);
-consvar_t cv_screenshot_folder = CVAR_INIT ("screenshot_folder", "", CV_SAVE, NULL, NULL);
+consvar_t cv_screenshot_option = CVAR_INIT ("screenshot_option", "Default", NULL, CV_SAVE|CV_CALL, screenshot_cons_t, Screenshot_option_Onchange);
+consvar_t cv_screenshot_folder = CVAR_INIT ("screenshot_folder", "", NULL, CV_SAVE, NULL, NULL);
-consvar_t cv_screenshot_colorprofile = CVAR_INIT ("screenshot_colorprofile", "Yes", CV_SAVE, CV_YesNo, NULL);
+consvar_t cv_screenshot_colorprofile = CVAR_INIT ("screenshot_colorprofile", "Yes", NULL, CV_SAVE, CV_YesNo, NULL);
static CV_PossibleValue_t moviemode_cons_t[] = {{MM_GIF, "GIF"}, {MM_APNG, "aPNG"}, {MM_SCREENSHOT, "Screenshots"}, {0, NULL}};
-consvar_t cv_moviemode = CVAR_INIT ("moviemode_mode", "GIF", CV_SAVE|CV_CALL, moviemode_cons_t, Moviemode_mode_Onchange);
+consvar_t cv_moviemode = CVAR_INIT ("moviemode_mode", "GIF", NULL, CV_SAVE|CV_CALL, moviemode_cons_t, Moviemode_mode_Onchange);
-consvar_t cv_movie_option = CVAR_INIT ("movie_option", "Default", CV_SAVE|CV_CALL, screenshot_cons_t, Moviemode_option_Onchange);
-consvar_t cv_movie_folder = CVAR_INIT ("movie_folder", "", CV_SAVE, NULL, NULL);
+consvar_t cv_movie_option = CVAR_INIT ("movie_option", "Default", NULL, CV_SAVE|CV_CALL, screenshot_cons_t, Moviemode_option_Onchange);
+consvar_t cv_movie_folder = CVAR_INIT ("movie_folder", "", NULL, CV_SAVE, NULL, NULL);
static CV_PossibleValue_t zlib_mem_level_t[] = {
{1, "(Min Memory) 1"},
@@ -153,17 +153,17 @@ static CV_PossibleValue_t apng_delay_t[] = {
// zlib memory usage is as follows:
// (1 << (zlib_window_bits+2)) + (1 << (zlib_level+9))
-consvar_t cv_zlib_memory = CVAR_INIT ("png_memory_level", "7", CV_SAVE, zlib_mem_level_t, NULL);
-consvar_t cv_zlib_level = CVAR_INIT ("png_compress_level", "(Optimal) 6", CV_SAVE, zlib_level_t, NULL);
-consvar_t cv_zlib_strategy = CVAR_INIT ("png_strategy", "Normal", CV_SAVE, zlib_strategy_t, NULL);
-consvar_t cv_zlib_window_bits = CVAR_INIT ("png_window_size", "32k", CV_SAVE, zlib_window_bits_t, NULL);
-
-consvar_t cv_zlib_memorya = CVAR_INIT ("apng_memory_level", "(Max Memory) 9", CV_SAVE, zlib_mem_level_t, NULL);
-consvar_t cv_zlib_levela = CVAR_INIT ("apng_compress_level", "4", CV_SAVE, zlib_level_t, NULL);
-consvar_t cv_zlib_strategya = CVAR_INIT ("apng_strategy", "RLE", CV_SAVE, zlib_strategy_t, NULL);
-consvar_t cv_zlib_window_bitsa = CVAR_INIT ("apng_window_size", "32k", CV_SAVE, zlib_window_bits_t, NULL);
-consvar_t cv_apng_delay = CVAR_INIT ("apng_speed", "1x", CV_SAVE, apng_delay_t, NULL);
-consvar_t cv_apng_downscale = CVAR_INIT ("apng_downscale", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_zlib_memory = CVAR_INIT ("png_memory_level", "7", NULL, CV_SAVE, zlib_mem_level_t, NULL);
+consvar_t cv_zlib_level = CVAR_INIT ("png_compress_level", "(Optimal) 6", NULL, CV_SAVE, zlib_level_t, NULL);
+consvar_t cv_zlib_strategy = CVAR_INIT ("png_strategy", "Normal", NULL, CV_SAVE, zlib_strategy_t, NULL);
+consvar_t cv_zlib_window_bits = CVAR_INIT ("png_window_size", "32k", NULL, CV_SAVE, zlib_window_bits_t, NULL);
+
+consvar_t cv_zlib_memorya = CVAR_INIT ("apng_memory_level", "(Max Memory) 9", NULL, CV_SAVE, zlib_mem_level_t, NULL);
+consvar_t cv_zlib_levela = CVAR_INIT ("apng_compress_level", "4", NULL, CV_SAVE, zlib_level_t, NULL);
+consvar_t cv_zlib_strategya = CVAR_INIT ("apng_strategy", "RLE", NULL, CV_SAVE, zlib_strategy_t, NULL);
+consvar_t cv_zlib_window_bitsa = CVAR_INIT ("apng_window_size", "32k", NULL, CV_SAVE, zlib_window_bits_t, NULL);
+consvar_t cv_apng_delay = CVAR_INIT ("apng_speed", "1x", NULL, CV_SAVE, apng_delay_t, NULL);
+consvar_t cv_apng_downscale = CVAR_INIT ("apng_downscale", "On", NULL, CV_SAVE, CV_OnOff, NULL);
#ifdef USE_APNG
static boolean apng_downscale = false; // So nobody can do something dumb like changing cvars mid output
diff --git a/src/netcode/d_clisrv.c b/src/netcode/d_clisrv.c
index 7a5fb06a6c37f4ff95cbef8abf25077a6c16d377..0688f79ece7ad160fee34f5eecf68e19c8b9cd96 100644
--- a/src/netcode/d_clisrv.c
+++ b/src/netcode/d_clisrv.c
@@ -103,23 +103,23 @@ UINT16 software_MAXPACKETLENGTH;
static tic_t gametime = 0;
static CV_PossibleValue_t netticbuffer_cons_t[] = {{0, "MIN"}, {3, "MAX"}, {0, NULL}};
-consvar_t cv_netticbuffer = CVAR_INIT ("netticbuffer", "1", CV_SAVE, netticbuffer_cons_t, NULL);
+consvar_t cv_netticbuffer = CVAR_INIT ("netticbuffer", "1", NULL, CV_SAVE, netticbuffer_cons_t, NULL);
static CV_PossibleValue_t resynchattempts_cons_t[] = {{1, "MIN"}, {20, "MAX"}, {0, "No"}, {0, NULL}};
-consvar_t cv_resynchattempts = CVAR_INIT ("resynchattempts", "10", CV_SAVE|CV_NETVAR, resynchattempts_cons_t, NULL);
+consvar_t cv_resynchattempts = CVAR_INIT ("resynchattempts", "10", "The amount of resync attempts before a connection is dropped", CV_SAVE|CV_NETVAR, resynchattempts_cons_t, NULL);
-consvar_t cv_blamecfail = CVAR_INIT ("blamecfail", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
+consvar_t cv_blamecfail = CVAR_INIT ("blamecfail", "Off", "Log client resynchronization", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
static CV_PossibleValue_t playbackspeed_cons_t[] = {{1, "MIN"}, {10, "MAX"}, {0, NULL}};
-consvar_t cv_playbackspeed = CVAR_INIT ("playbackspeed", "1", 0, playbackspeed_cons_t, NULL);
+consvar_t cv_playbackspeed = CVAR_INIT ("playbackspeed", "1", NULL, 0, playbackspeed_cons_t, NULL);
-consvar_t cv_dedicatedidletime = CVAR_INIT ("dedicatedidletime", "10", CV_SAVE|CV_NETVAR, CV_Unsigned, NULL);
+consvar_t cv_dedicatedidletime = CVAR_INIT ("dedicatedidletime", "10", "The amount of seconds until the server stops the world when no player is active", CV_SAVE|CV_NETVAR, CV_Unsigned, NULL);
static CV_PossibleValue_t idleaction_cons_t[] = {{1, "Kick"}, {2, "Spectate"}, {0, NULL}};
-consvar_t cv_idleaction = CVAR_INIT ("idleaction", "Spectate", CV_SAVE|CV_NETVAR, idleaction_cons_t, NULL);
-consvar_t cv_idletime = CVAR_INIT ("idletime", "3", CV_SAVE|CV_NETVAR, CV_Unsigned, NULL);
+consvar_t cv_idleaction = CVAR_INIT ("idleaction", "Spectate", "What action to take when a player is inactive", CV_SAVE|CV_NETVAR, idleaction_cons_t, NULL);
+consvar_t cv_idletime = CVAR_INIT ("idletime", "3", "Amount of time until a player is considered inactive and is kicked or moved to spectator", CV_SAVE|CV_NETVAR, CV_Unsigned, NULL);
-consvar_t cv_httpsource = CVAR_INIT ("http_source", "", CV_SAVE, NULL, NULL);
+consvar_t cv_httpsource = CVAR_INIT ("http_source", "", "Tells clients to use this URL instead of in-game when downloading addons", CV_SAVE, NULL, NULL);
void ResetNode(INT32 node)
{
@@ -1665,24 +1665,24 @@ void D_ClientServerInit(void)
DEBFILE(va("- - -== SRB2 v%d.%.2d.%d "VERSIONSTRING" debugfile ==- - -\n",
VERSION/100, VERSION%100, SUBVERSION));
- COM_AddCommand("getplayernum", Command_GetPlayerNum, COM_LUA);
- COM_AddCommand("kick", Command_Kick, COM_LUA);
- COM_AddCommand("ban", Command_Ban, COM_LUA);
- COM_AddCommand("banip", Command_BanIP, COM_LUA);
- COM_AddCommand("clearbans", Command_ClearBans, COM_LUA);
- COM_AddCommand("showbanlist", Command_ShowBan, COM_LUA);
- COM_AddCommand("reloadbans", Command_ReloadBan, COM_LUA);
- COM_AddCommand("connect", Command_connect, COM_LUA);
- COM_AddCommand("nodes", Command_Nodes, COM_LUA);
- COM_AddCommand("set_http_login", Command_set_http_login, 0);
- COM_AddCommand("list_http_logins", Command_list_http_logins, 0);
- COM_AddCommand("resendgamestate", Command_ResendGamestate, COM_LUA);
+ COM_AddCommand("getplayernum", NULL, Command_GetPlayerNum, COM_LUA);
+ COM_AddCommand("kick", "Kick a player from the server", Command_Kick, COM_LUA);
+ COM_AddCommand("ban", "Ban a player from the server", Command_Ban, COM_LUA);
+ COM_AddCommand("banip", "Ban an IP address from the server", Command_BanIP, COM_LUA);
+ COM_AddCommand("clearbans", "Erase all bans", Command_ClearBans, COM_LUA);
+ COM_AddCommand("showbanlist", "List all bans", Command_ShowBan, COM_LUA);
+ COM_AddCommand("reloadbans", "Reload the banlist from storage", Command_ReloadBan, COM_LUA);
+ COM_AddCommand("connect", "Connect to a server", Command_connect, COM_LUA);
+ COM_AddCommand("nodes", "List connected players", Command_Nodes, COM_LUA);
+ COM_AddCommand("set_http_login", NULL, Command_set_http_login, 0);
+ COM_AddCommand("list_http_logins", NULL, Command_list_http_logins, 0);
+ COM_AddCommand("resendgamestate", "Resynchronize a player", Command_ResendGamestate, COM_LUA);
#ifdef PACKETDROP
- COM_AddCommand("drop", Command_Drop, COM_LUA);
- COM_AddCommand("droprate", Command_Droprate, COM_LUA);
+ COM_AddCommand("drop", NULL, Command_Drop, COM_LUA);
+ COM_AddCommand("droprate", NULL, Command_Droprate, COM_LUA);
#endif
#ifdef _DEBUG
- COM_AddCommand("numnodes", Command_Numnodes, COM_LUA);
+ COM_AddCommand("numnodes", NULL, Command_Numnodes, COM_LUA);
#endif
RegisterNetXCmd(XD_KICK, Got_KickCmd);
diff --git a/src/netcode/d_netcmd.c b/src/netcode/d_netcmd.c
index 35e28db364fd84c39e7857113f20ec039060b0bb..ab861ba92bde8ec812835d0731295b552fae25d8 100644
--- a/src/netcode/d_netcmd.c
+++ b/src/netcode/d_netcmd.c
@@ -213,193 +213,190 @@ static CV_PossibleValue_t matchboxes_cons_t[] = {{0, "Normal"}, {1, "Mystery"},
static CV_PossibleValue_t chances_cons_t[] = {{0, "MIN"}, {9, "MAX"}, {0, NULL}};
static CV_PossibleValue_t pause_cons_t[] = {{0, "Server"}, {1, "All"}, {0, NULL}};
-consvar_t cv_showinput = CVAR_INIT ("showinput", "Off", CV_ALLOWLUA, CV_OnOff, NULL);
-consvar_t cv_showinputjoy = CVAR_INIT ("showinputjoy", "Off", CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_showinput = CVAR_INIT ("showinput", "Off", "If enabled, player input will be displayed on the bottom-left", CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_showinputjoy = CVAR_INIT ("showinputjoy", "Off", "If enabled, show a joystick instead of a d-pad on inputjoy", CV_ALLOWLUA, CV_OnOff, NULL);
#ifdef NETGAME_DEVMODE
-static consvar_t cv_fishcake = CVAR_INIT ("fishcake", "Off", CV_CALL|CV_NOSHOWHELP|CV_RESTRICT, CV_OnOff, Fishcake_OnChange);
+static consvar_t cv_fishcake = CVAR_INIT ("fishcake", "Off", NULL, CV_CALL|CV_NOSHOWHELP|CV_RESTRICT, CV_OnOff, Fishcake_OnChange);
#endif
-static consvar_t cv_dummyconsvar = CVAR_INIT ("dummyconsvar", "Off", CV_CALL|CV_NOSHOWHELP, CV_OnOff, DummyConsvar_OnChange);
+static consvar_t cv_dummyconsvar = CVAR_INIT ("dummyconsvar", "Off", NULL, CV_CALL|CV_NOSHOWHELP, CV_OnOff, DummyConsvar_OnChange);
-consvar_t cv_restrictskinchange = CVAR_INIT ("restrictskinchange", "Yes", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, CV_YesNo, NULL);
-consvar_t cv_allowteamchange = CVAR_INIT ("allowteamchange", "Yes", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL);
+consvar_t cv_restrictskinchange = CVAR_INIT ("restrictskinchange", "Yes", "If enabled, skin changes will be restricted according to gametype", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, CV_YesNo, NULL);
+consvar_t cv_allowteamchange = CVAR_INIT ("allowteamchange", "Yes", "If players should be allowed to change teams", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL);
-consvar_t cv_startinglives = CVAR_INIT ("startinglives", "3", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, startingliveslimit_cons_t, NULL);
+consvar_t cv_startinglives = CVAR_INIT ("startinglives", "3", "Amount of lives to start with in multiplayer games", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, startingliveslimit_cons_t, NULL);
static CV_PossibleValue_t respawntime_cons_t[] = {{1, "MIN"}, {30, "MAX"}, {0, "Off"}, {0, NULL}};
-consvar_t cv_respawntime = CVAR_INIT ("respawndelay", "3", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, respawntime_cons_t, NULL);
+consvar_t cv_respawntime = CVAR_INIT ("respawndelay", "3", "Time, in seconds, until the player is allowed to respawn in Ringslinger gametypes", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, respawntime_cons_t, NULL);
-consvar_t cv_competitionboxes = CVAR_INIT ("competitionboxes", "Mystery", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, competitionboxes_cons_t, NULL);
+consvar_t cv_competitionboxes = CVAR_INIT ("competitionboxes", "Mystery", NULL, CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, competitionboxes_cons_t, NULL);
static CV_PossibleValue_t seenames_cons_t[] = {{0, "Off"}, {1, "Colorless"}, {2, "Team"}, {3, "Ally/Foe"}, {0, NULL}};
-consvar_t cv_seenames = CVAR_INIT ("seenames", "Ally/Foe", CV_SAVE|CV_ALLOWLUA, seenames_cons_t, 0);
-consvar_t cv_allowseenames = CVAR_INIT ("allowseenames", "Yes", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL);
+consvar_t cv_seenames = CVAR_INIT ("seenames", "Ally/Foe", "How player name tags are displayed when looking at other players", CV_SAVE|CV_ALLOWLUA, seenames_cons_t, 0);
+consvar_t cv_allowseenames = CVAR_INIT ("allowseenames", "Yes", "If players are allowed to view other player's names by looking at them", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL);
// names
-consvar_t cv_playername = CVAR_INIT ("name", "Sonic", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name_OnChange);
-consvar_t cv_playername2 = CVAR_INIT ("name2", "Tails", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name2_OnChange);
+consvar_t cv_playername = CVAR_INIT ("name", "Sonic", "Player name in multiplayer", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name_OnChange);
+consvar_t cv_playername2 = CVAR_INIT ("name2", "Tails", "Player name in multiplayer for player 2", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name2_OnChange);
// player colors
UINT16 lastgoodcolor = SKINCOLOR_BLUE, lastgoodcolor2 = SKINCOLOR_BLUE;
-consvar_t cv_playercolor = CVAR_INIT ("color", "Blue", CV_CALL|CV_NOINIT|CV_ALLOWLUA, Color_cons_t, Color_OnChange);
-consvar_t cv_playercolor2 = CVAR_INIT ("color2", "Orange", CV_CALL|CV_NOINIT|CV_ALLOWLUA, Color_cons_t, Color2_OnChange);
+consvar_t cv_playercolor = CVAR_INIT ("color", "Blue", NULL, CV_CALL|CV_NOINIT|CV_ALLOWLUA, Color_cons_t, Color_OnChange);
+consvar_t cv_playercolor2 = CVAR_INIT ("color2", "Orange", NULL, CV_CALL|CV_NOINIT|CV_ALLOWLUA, Color_cons_t, Color2_OnChange);
// player's skin, saved for commodity, when using a favorite skins wad..
-consvar_t cv_skin = CVAR_INIT_WITH_CALLBACKS ("skin", DEFAULTSKIN, CV_CALL|CV_NOINIT|CV_ALLOWLUA, NULL, Skin_OnChange, Skin_CanChange);
-consvar_t cv_skin2 = CVAR_INIT_WITH_CALLBACKS ("skin2", DEFAULTSKIN2, CV_CALL|CV_NOINIT|CV_ALLOWLUA, NULL, Skin2_OnChange, Skin2_CanChange);
+consvar_t cv_skin = CVAR_INIT_WITH_CALLBACKS ("skin", DEFAULTSKIN, "Player character to play as in multiplayer", CV_CALL|CV_NOINIT|CV_ALLOWLUA, NULL, Skin_OnChange, Skin_CanChange);
+consvar_t cv_skin2 = CVAR_INIT_WITH_CALLBACKS ("skin2", DEFAULTSKIN2, "Player character to play as in multiplayer for player 2", CV_CALL|CV_NOINIT|CV_ALLOWLUA, NULL, Skin2_OnChange, Skin2_CanChange);
// saved versions of the above six
-consvar_t cv_defaultplayercolor = CVAR_INIT ("defaultcolor", "Blue", CV_SAVE, Color_cons_t, NULL);
-consvar_t cv_defaultplayercolor2 = CVAR_INIT ("defaultcolor2", "Orange", CV_SAVE, Color_cons_t, NULL);
-consvar_t cv_defaultskin = CVAR_INIT ("defaultskin", DEFAULTSKIN, CV_SAVE, NULL, NULL);
-consvar_t cv_defaultskin2 = CVAR_INIT ("defaultskin2", DEFAULTSKIN2, CV_SAVE, NULL, NULL);
+consvar_t cv_defaultplayercolor = CVAR_INIT ("defaultcolor", "Blue", NULL, CV_SAVE, Color_cons_t, NULL);
+consvar_t cv_defaultplayercolor2 = CVAR_INIT ("defaultcolor2", "Orange", NULL, CV_SAVE, Color_cons_t, NULL);
+consvar_t cv_defaultskin = CVAR_INIT ("defaultskin", DEFAULTSKIN, NULL, CV_SAVE, NULL, NULL);
+consvar_t cv_defaultskin2 = CVAR_INIT ("defaultskin2", DEFAULTSKIN2, NULL, CV_SAVE, NULL, NULL);
-consvar_t cv_skipmapcheck = CVAR_INIT ("skipmapcheck", "Off", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_skipmapcheck = CVAR_INIT ("skipmapcheck", "Off", NULL, CV_SAVE, CV_OnOff, NULL);
INT32 cv_debug;
-consvar_t cv_usemouse = CVAR_INIT ("use_mouse", "On", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse);
-consvar_t cv_usemouse2 = CVAR_INIT ("use_mouse2", "Off", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse2);
+consvar_t cv_usemouse = CVAR_INIT ("use_mouse", "On", "If enabled, the game will use mouse input", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse);
+consvar_t cv_usemouse2 = CVAR_INIT ("use_mouse2", "Off", "If enabled, the game will use mouse input for player 2", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse2);
-consvar_t cv_usejoystick = CVAR_INIT ("use_gamepad", "1", CV_SAVE|CV_CALL, usejoystick_cons_t, I_InitJoystick);
-consvar_t cv_usejoystick2 = CVAR_INIT ("use_gamepad2", "2", CV_SAVE|CV_CALL, usejoystick_cons_t, I_InitJoystick2);
+consvar_t cv_usejoystick = CVAR_INIT ("use_gamepad", "1", NULL, CV_SAVE|CV_CALL, usejoystick_cons_t, I_InitJoystick);
+consvar_t cv_usejoystick2 = CVAR_INIT ("use_gamepad2", "2", NULL, CV_SAVE|CV_CALL, usejoystick_cons_t, I_InitJoystick2);
#if (defined (LJOYSTICK) || defined (HAVE_SDL))
#ifdef LJOYSTICK
-consvar_t cv_joyport = CVAR_INIT ("padport", "/dev/js0", CV_SAVE, joyport_cons_t, NULL);
-consvar_t cv_joyport2 = CVAR_INIT ("padport2", "/dev/js0", CV_SAVE, joyport_cons_t, NULL); //Alam: for later
+consvar_t cv_joyport = CVAR_INIT ("padport", "/dev/js0", NULL, CV_SAVE, joyport_cons_t, NULL);
+consvar_t cv_joyport2 = CVAR_INIT ("padport2", "/dev/js0", NULL, CV_SAVE, joyport_cons_t, NULL); //Alam: for later
#endif
-consvar_t cv_joyscale = CVAR_INIT ("padscale", "1", CV_SAVE|CV_CALL, NULL, I_JoyScale);
-consvar_t cv_joyscale2 = CVAR_INIT ("padscale2", "1", CV_SAVE|CV_CALL, NULL, I_JoyScale2);
+consvar_t cv_joyscale = CVAR_INIT ("padscale", "1", NULL, CV_SAVE|CV_CALL, NULL, I_JoyScale);
+consvar_t cv_joyscale2 = CVAR_INIT ("padscale2", "1", NULL, CV_SAVE|CV_CALL, NULL, I_JoyScale2);
#else
-consvar_t cv_joyscale = CVAR_INIT ("padscale", "1", CV_SAVE|CV_HIDEN, NULL, NULL); //Alam: Dummy for save
-consvar_t cv_joyscale2 = CVAR_INIT ("padscale2", "1", CV_SAVE|CV_HIDEN, NULL, NULL); //Alam: Dummy for save
+consvar_t cv_joyscale = CVAR_INIT ("padscale", "1", NULL, CV_SAVE|CV_HIDEN, NULL, NULL); //Alam: Dummy for save
+consvar_t cv_joyscale2 = CVAR_INIT ("padscale2", "1", NULL, CV_SAVE|CV_HIDEN, NULL, NULL); //Alam: Dummy for save
#endif
#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
-consvar_t cv_mouse2port = CVAR_INIT ("mouse2port", "/dev/gpmdata", CV_SAVE, mouse2port_cons_t, NULL);
-consvar_t cv_mouse2opt = CVAR_INIT ("mouse2opt", "0", CV_SAVE, NULL, NULL);
+consvar_t cv_mouse2port = CVAR_INIT ("mouse2port", "/dev/gpmdata", NULL, CV_SAVE, mouse2port_cons_t, NULL);
+consvar_t cv_mouse2opt = CVAR_INIT ("mouse2opt", "0", NULL, CV_SAVE, NULL, NULL);
#else
-consvar_t cv_mouse2port = CVAR_INIT ("mouse2port", "COM2", CV_SAVE, mouse2port_cons_t, NULL);
+consvar_t cv_mouse2port = CVAR_INIT ("mouse2port", "COM2", NULL, CV_SAVE, mouse2port_cons_t, NULL);
#endif
-consvar_t cv_matchboxes = CVAR_INIT ("matchboxes", "Normal", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, matchboxes_cons_t, NULL);
-consvar_t cv_specialrings = CVAR_INIT ("specialrings", "On", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
-consvar_t cv_powerstones = CVAR_INIT ("powerstones", "On", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_matchboxes = CVAR_INIT ("matchboxes", "Normal", NULL, CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, matchboxes_cons_t, NULL);
+consvar_t cv_specialrings = CVAR_INIT ("specialrings", "On", NULL, CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_powerstones = CVAR_INIT ("powerstones", "On", "If enabled, emeralds will spawn in Ringslinger", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
-consvar_t cv_recycler = CVAR_INIT ("tv_recycler", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
-consvar_t cv_teleporters = CVAR_INIT ("tv_teleporter", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
-consvar_t cv_superring = CVAR_INIT ("tv_superring", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
-consvar_t cv_supersneakers = CVAR_INIT ("tv_supersneaker", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
-consvar_t cv_invincibility = CVAR_INIT ("tv_invincibility", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
-consvar_t cv_jumpshield = CVAR_INIT ("tv_jumpshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
-consvar_t cv_watershield = CVAR_INIT ("tv_watershield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
-consvar_t cv_ringshield = CVAR_INIT ("tv_ringshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
-consvar_t cv_forceshield = CVAR_INIT ("tv_forceshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
-consvar_t cv_bombshield = CVAR_INIT ("tv_bombshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
-consvar_t cv_1up = CVAR_INIT ("tv_1up", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
-consvar_t cv_eggmanbox = CVAR_INIT ("tv_eggman", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_recycler = CVAR_INIT ("tv_recycler", "5", "Chances of this monitor type to spawn", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_teleporters = CVAR_INIT ("tv_teleporter", "5", "Chances of this monitor type to spawn", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_superring = CVAR_INIT ("tv_superring", "5", "Chances of this monitor type to spawn", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_supersneakers = CVAR_INIT ("tv_supersneaker", "5", "Chances of this monitor type to spawn", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_invincibility = CVAR_INIT ("tv_invincibility", "5", "Chances of this monitor type to spawn", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_jumpshield = CVAR_INIT ("tv_jumpshield", "5", "Chances of this monitor type to spawn", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_watershield = CVAR_INIT ("tv_watershield", "5", "Chances of this monitor type to spawn", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_ringshield = CVAR_INIT ("tv_ringshield", "5", "Chances of this monitor type to spawn", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_forceshield = CVAR_INIT ("tv_forceshield", "5", "Chances of this monitor type to spawn", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_bombshield = CVAR_INIT ("tv_bombshield", "5", "Chances of this monitor type to spawn", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_1up = CVAR_INIT ("tv_1up", "5", "Chances of this monitor type to spawn", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_eggmanbox = CVAR_INIT ("tv_eggman", "5", "Chances of this monitor type to spawn", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
-consvar_t cv_ringslinger = CVAR_INIT ("ringslinger", "No", CV_NETVAR|CV_NOSHOWHELP|CV_CALL|CV_CHEAT|CV_ALLOWLUA, CV_YesNo, Ringslinger_OnChange);
-consvar_t cv_gravity = CVAR_INIT ("gravity", "0.5", CV_RESTRICT|CV_FLOAT|CV_CALL|CV_ALLOWLUA, NULL, Gravity_OnChange);
+consvar_t cv_ringslinger = CVAR_INIT ("ringslinger", "No", "If enabled, ringslinger will be allowed in non-ringslinger gametypes", CV_NETVAR|CV_NOSHOWHELP|CV_CALL|CV_CHEAT|CV_ALLOWLUA, CV_YesNo, Ringslinger_OnChange);
+consvar_t cv_gravity = CVAR_INIT ("gravity", "0.5", "Multiplier for player weight", CV_RESTRICT|CV_FLOAT|CV_CALL|CV_ALLOWLUA, NULL, Gravity_OnChange);
-consvar_t cv_soundtest = CVAR_INIT ("soundtest", "0", CV_CALL, NULL, SoundTest_OnChange);
+consvar_t cv_soundtest = CVAR_INIT ("soundtest", "0", NULL, CV_CALL, NULL, SoundTest_OnChange);
static CV_PossibleValue_t minitimelimit_cons_t[] = {{1, "MIN"}, {9999, "MAX"}, {0, NULL}};
-consvar_t cv_countdowntime = CVAR_INIT ("countdowntime", "60", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, minitimelimit_cons_t, NULL);
+consvar_t cv_countdowntime = CVAR_INIT ("countdowntime", "60", NULL, CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, minitimelimit_cons_t, NULL);
-consvar_t cv_touchtag = CVAR_INIT ("touchtag", "Off", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
-consvar_t cv_hidetime = CVAR_INIT ("hidetime", "30", CV_SAVE|CV_NETVAR|CV_CALL|CV_ALLOWLUA, minitimelimit_cons_t, Hidetime_OnChange);
+consvar_t cv_touchtag = CVAR_INIT ("touchtag", "Off", NULL, CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_hidetime = CVAR_INIT ("hidetime", "30", "Time, in seconds, players have to hide before the seeker is allowed to move", CV_SAVE|CV_NETVAR|CV_CALL|CV_ALLOWLUA, minitimelimit_cons_t, Hidetime_OnChange);
-consvar_t cv_autobalance = CVAR_INIT ("autobalance", "Off", CV_SAVE|CV_NETVAR|CV_CALL|CV_ALLOWLUA, CV_OnOff, AutoBalance_OnChange);
-consvar_t cv_teamscramble = CVAR_INIT ("teamscramble", "Off", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, teamscramble_cons_t, TeamScramble_OnChange);
-consvar_t cv_scrambleonchange = CVAR_INIT ("scrambleonchange", "Off", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, teamscramble_cons_t, NULL);
+consvar_t cv_autobalance = CVAR_INIT ("autobalance", "Off", NULL, CV_SAVE|CV_NETVAR|CV_CALL|CV_ALLOWLUA, CV_OnOff, AutoBalance_OnChange);
+consvar_t cv_teamscramble = CVAR_INIT ("teamscramble", "Off", NULL, CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, teamscramble_cons_t, TeamScramble_OnChange);
+consvar_t cv_scrambleonchange = CVAR_INIT ("scrambleonchange", "Off", NULL, CV_SAVE|CV_NETVAR|CV_ALLOWLUA, teamscramble_cons_t, NULL);
-consvar_t cv_friendlyfire = CVAR_INIT ("friendlyfire", "Off", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
-consvar_t cv_itemfinder = CVAR_INIT ("itemfinder", "Off", CV_CALL|CV_ALLOWLUA, CV_OnOff, ItemFinder_OnChange);
+consvar_t cv_friendlyfire = CVAR_INIT ("friendlyfire", "Off", NULL, CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_itemfinder = CVAR_INIT ("itemfinder", "Off", NULL, CV_CALL|CV_ALLOWLUA, CV_OnOff, ItemFinder_OnChange);
// Scoring type options
-consvar_t cv_overtime = CVAR_INIT ("overtime", "Yes", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL);
+consvar_t cv_overtime = CVAR_INIT ("overtime", "Yes", NULL, CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL);
-consvar_t cv_rollingdemos = CVAR_INIT ("rollingdemos", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_rollingdemos = CVAR_INIT ("rollingdemos", "On", NULL, CV_SAVE, CV_OnOff, NULL);
static CV_PossibleValue_t timetic_cons_t[] = {{0, "Classic"}, {1, "Centiseconds"}, {2, "Mania"}, {3, "Tics"}, {0, NULL}};
-consvar_t cv_timetic = CVAR_INIT ("timerres", "Mania", CV_SAVE, timetic_cons_t, NULL);
+consvar_t cv_timetic = CVAR_INIT ("timerres", "Mania", NULL, CV_SAVE, timetic_cons_t, NULL);
static CV_PossibleValue_t powerupdisplay_cons_t[] = {{0, "Never"}, {1, "First-person only"}, {2, "Always"}, {0, NULL}};
-consvar_t cv_powerupdisplay = CVAR_INIT ("powerupdisplay", "First-person only", CV_SAVE, powerupdisplay_cons_t, NULL);
+consvar_t cv_powerupdisplay = CVAR_INIT ("powerupdisplay", "First-person only", NULL, CV_SAVE, powerupdisplay_cons_t, NULL);
static CV_PossibleValue_t pointlimit_cons_t[] = {{1, "MIN"}, {MAXSCORE, "MAX"}, {0, "None"}, {0, NULL}};
-consvar_t cv_pointlimit = CVAR_INIT ("pointlimit", "None", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, pointlimit_cons_t, PointLimit_OnChange);
+consvar_t cv_pointlimit = CVAR_INIT ("pointlimit", "None", NULL, CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, pointlimit_cons_t, PointLimit_OnChange);
static CV_PossibleValue_t timelimit_cons_t[] = {{1, "MIN"}, {30, "MAX"}, {0, "None"}, {0, NULL}};
-consvar_t cv_timelimit = CVAR_INIT ("timelimit", "None", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, timelimit_cons_t, TimeLimit_OnChange);
+consvar_t cv_timelimit = CVAR_INIT ("timelimit", "None", NULL, CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, timelimit_cons_t, TimeLimit_OnChange);
static CV_PossibleValue_t numlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, NULL}};
-consvar_t cv_numlaps = CVAR_INIT ("numlaps", "4", CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, numlaps_cons_t, NumLaps_OnChange);
+consvar_t cv_numlaps = CVAR_INIT ("numlaps", "4", NULL, CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, numlaps_cons_t, NumLaps_OnChange);
static CV_PossibleValue_t basenumlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, "Map default"}, {0, NULL}};
-consvar_t cv_basenumlaps = CVAR_INIT ("basenumlaps", "Map default", CV_SAVE|CV_NETVAR|CV_CALL|CV_CHEAT|CV_ALLOWLUA, basenumlaps_cons_t, BaseNumLaps_OnChange);
+consvar_t cv_basenumlaps = CVAR_INIT ("basenumlaps", "Map default", NULL, CV_SAVE|CV_NETVAR|CV_CALL|CV_CHEAT|CV_ALLOWLUA, basenumlaps_cons_t, BaseNumLaps_OnChange);
// Point and time limits for every gametype
INT32 pointlimits[NUMGAMETYPES];
INT32 timelimits[NUMGAMETYPES];
-// log elemental hazards -- not a netvar, is local to current player
-consvar_t cv_hazardlog = CVAR_INIT ("hazardlog", "Yes", 0, CV_YesNo, NULL);
+consvar_t cv_hazardlog = CVAR_INIT ("hazardlog", "Yes", "Log elemental hazards", 0, CV_YesNo, NULL);
-consvar_t cv_forceskin = CVAR_INIT ("forceskin", "None", CV_NETVAR|CV_CALL|CV_CHEAT|CV_ALLOWLUA, NULL, ForceSkin_OnChange);
-consvar_t cv_downloading = CVAR_INIT ("downloading", "On", 0, CV_OnOff, NULL);
-consvar_t cv_allowexitlevel = CVAR_INIT ("allowexitlevel", "No", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL);
+consvar_t cv_forceskin = CVAR_INIT ("forceskin", "None", "Forces all players to use the specified skin, if specified", CV_NETVAR|CV_CALL|CV_CHEAT|CV_ALLOWLUA, NULL, ForceSkin_OnChange);
+consvar_t cv_downloading = CVAR_INIT ("downloading", "On", "Allow clients to download addons from the server", 0, CV_OnOff, NULL);
+consvar_t cv_allowexitlevel = CVAR_INIT ("allowexitlevel", "No", NULL, CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL);
-consvar_t cv_killingdead = CVAR_INIT ("killingdead", "Off", CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_killingdead = CVAR_INIT ("killingdead", "Off", NULL, CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
-consvar_t cv_netstat = CVAR_INIT ("netstat", "Off", 0, CV_OnOff, NULL); // show bandwidth statistics
+consvar_t cv_netstat = CVAR_INIT ("netstat", "Off", "Display network bandwidth statistics", 0, CV_OnOff, NULL);
static CV_PossibleValue_t nettimeout_cons_t[] = {{TICRATE/7, "MIN"}, {60*TICRATE, "MAX"}, {0, NULL}};
-consvar_t cv_nettimeout = CVAR_INIT ("nettimeout", "350", CV_CALL|CV_SAVE, nettimeout_cons_t, NetTimeout_OnChange);
+consvar_t cv_nettimeout = CVAR_INIT ("nettimeout", "350", NULL, CV_CALL|CV_SAVE, nettimeout_cons_t, NetTimeout_OnChange);
static CV_PossibleValue_t jointimeout_cons_t[] = {{5*TICRATE, "MIN"}, {60*TICRATE, "MAX"}, {0, NULL}};
-consvar_t cv_jointimeout = CVAR_INIT ("jointimeout", "350", CV_CALL|CV_SAVE|CV_NETVAR, jointimeout_cons_t, JoinTimeout_OnChange);
-consvar_t cv_maxping = CVAR_INIT ("maxping", "0", CV_SAVE|CV_NETVAR, CV_Unsigned, NULL);
+consvar_t cv_jointimeout = CVAR_INIT ("jointimeout", "350", NULL, CV_CALL|CV_SAVE|CV_NETVAR, jointimeout_cons_t, JoinTimeout_OnChange);
+consvar_t cv_maxping = CVAR_INIT ("maxping", "0", NULL, CV_SAVE|CV_NETVAR, CV_Unsigned, NULL);
static CV_PossibleValue_t pingtimeout_cons_t[] = {{8, "MIN"}, {120, "MAX"}, {0, NULL}};
-consvar_t cv_pingtimeout = CVAR_INIT ("pingtimeout", "10", CV_SAVE|CV_NETVAR, pingtimeout_cons_t, NULL);
+consvar_t cv_pingtimeout = CVAR_INIT ("pingtimeout", "10", NULL, CV_SAVE|CV_NETVAR, pingtimeout_cons_t, NULL);
-// show your ping on the HUD next to framerate. Defaults to warning only (shows up if your ping is > maxping)
static CV_PossibleValue_t showping_cons_t[] = {{0, "Off"}, {1, "Always"}, {2, "Warning"}, {0, NULL}};
-consvar_t cv_showping = CVAR_INIT ("showping", "Warning", CV_SAVE, showping_cons_t, NULL);
+consvar_t cv_showping = CVAR_INIT ("showping", "Warning", "Show current latency to the server", CV_SAVE, showping_cons_t, NULL);
-// Intermission time Tails 04-19-2002
static CV_PossibleValue_t inttime_cons_t[] = {{0, "MIN"}, {3600, "MAX"}, {0, NULL}};
-consvar_t cv_inttime = CVAR_INIT ("inttime", "10", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, inttime_cons_t, NULL);
+consvar_t cv_inttime = CVAR_INIT ("inttime", "10", "Time spent in intemissions before the next map start", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, inttime_cons_t, NULL);
static CV_PossibleValue_t coopstarposts_cons_t[] = {{0, "Per-player"}, {1, "Shared"}, {2, "Teamwork"}, {0, NULL}};
-consvar_t cv_coopstarposts = CVAR_INIT ("coopstarposts", "Per-player", CV_SAVE|CV_NETVAR|CV_CALL|CV_ALLOWLUA, coopstarposts_cons_t, CoopStarposts_OnChange);
+consvar_t cv_coopstarposts = CVAR_INIT ("coopstarposts", "Per-player", "How starposts behave in co-op", CV_SAVE|CV_NETVAR|CV_CALL|CV_ALLOWLUA, coopstarposts_cons_t, CoopStarposts_OnChange);
static CV_PossibleValue_t cooplives_cons_t[] = {{0, "Infinite"}, {1, "Per-player"}, {2, "Avoid Game Over"}, {3, "Single pool"}, {0, NULL}};
-consvar_t cv_cooplives = CVAR_INIT ("cooplives", "Avoid Game Over", CV_SAVE|CV_NETVAR|CV_CALL|CV_CHEAT|CV_ALLOWLUA, cooplives_cons_t, CoopLives_OnChange);
+consvar_t cv_cooplives = CVAR_INIT ("cooplives", "Avoid Game Over", "How lives behave in co-op", CV_SAVE|CV_NETVAR|CV_CALL|CV_CHEAT|CV_ALLOWLUA, cooplives_cons_t, CoopLives_OnChange);
static CV_PossibleValue_t advancemap_cons_t[] = {{0, "Off"}, {1, "Next"}, {2, "Random"}, {0, NULL}};
-consvar_t cv_advancemap = CVAR_INIT ("advancemap", "Random", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, advancemap_cons_t, NULL);
+consvar_t cv_advancemap = CVAR_INIT ("advancemap", "Random", NULL, CV_SAVE|CV_NETVAR|CV_ALLOWLUA, advancemap_cons_t, NULL);
static CV_PossibleValue_t playersforexit_cons_t[] = {{0, "One"}, {1, "1/4"}, {2, "Half"}, {3, "3/4"}, {4, "All"}, {0, NULL}};
-consvar_t cv_playersforexit = CVAR_INIT ("playersforexit", "3/4", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, playersforexit_cons_t, NULL);
+consvar_t cv_playersforexit = CVAR_INIT ("playersforexit", "3/4", "The amount of players that have to finish a map in co-op for the map to end", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, playersforexit_cons_t, NULL);
-consvar_t cv_exitmove = CVAR_INIT ("exitmove", "On", CV_SAVE|CV_NETVAR|CV_CALL|CV_ALLOWLUA, CV_OnOff, ExitMove_OnChange);
+consvar_t cv_exitmove = CVAR_INIT ("exitmove", "On", "If on, players are allowed to move around after finishing a map in co-op", CV_SAVE|CV_NETVAR|CV_CALL|CV_ALLOWLUA, CV_OnOff, ExitMove_OnChange);
-consvar_t cv_runscripts = CVAR_INIT ("runscripts", "Yes", CV_ALLOWLUA, CV_YesNo, NULL);
+consvar_t cv_runscripts = CVAR_INIT ("runscripts", "Yes", NULL, CV_ALLOWLUA, CV_YesNo, NULL);
-consvar_t cv_pause = CVAR_INIT ("pausepermission", "Server", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, pause_cons_t, NULL);
-consvar_t cv_mute = CVAR_INIT ("mute", "Off", CV_NETVAR|CV_CALL|CV_ALLOWLUA, CV_OnOff, Mute_OnChange);
+consvar_t cv_pause = CVAR_INIT ("pausepermission", "Server", NULL, CV_SAVE|CV_NETVAR|CV_ALLOWLUA, pause_cons_t, NULL);
+consvar_t cv_mute = CVAR_INIT ("mute", "Off", "Disables chat for all players", CV_NETVAR|CV_CALL|CV_ALLOWLUA, CV_OnOff, Mute_OnChange);
-consvar_t cv_sleep = CVAR_INIT ("cpusleep", "1", CV_SAVE, sleeping_cons_t, NULL);
+consvar_t cv_sleep = CVAR_INIT ("cpusleep", "1", NULL, CV_SAVE, sleeping_cons_t, NULL);
static CV_PossibleValue_t perfstats_cons_t[] = {
{0, "Off"}, {1, "Rendering"}, {2, "Logic"}, {3, "ThinkFrame"}, {4, "PreThinkFrame"}, {5, "PostThinkFrame"}, {0, NULL}};
-consvar_t cv_perfstats = CVAR_INIT ("perfstats", "Off", CV_CALL, perfstats_cons_t, PS_PerfStats_OnChange);
+consvar_t cv_perfstats = CVAR_INIT ("perfstats", "Off", "Display performance statistics", CV_CALL, perfstats_cons_t, PS_PerfStats_OnChange);
static CV_PossibleValue_t ps_samplesize_cons_t[] = {
{1, "MIN"}, {1000, "MAX"}, {0, NULL}};
-consvar_t cv_ps_samplesize = CVAR_INIT ("ps_samplesize", "175", CV_CALL, ps_samplesize_cons_t, PS_SampleSize_OnChange);
+consvar_t cv_ps_samplesize = CVAR_INIT ("ps_samplesize", "70", "How many samples to gather and aggregate in perfstats", CV_CALL, ps_samplesize_cons_t, PS_SampleSize_OnChange);
static CV_PossibleValue_t ps_descriptor_cons_t[] = {
{1, "Average"}, {2, "SD"}, {3, "Minimum"}, {4, "Maximum"}, {0, NULL}};
-consvar_t cv_ps_descriptor = CVAR_INIT ("ps_descriptor", "Average", 0, ps_descriptor_cons_t, NULL);
+consvar_t cv_ps_descriptor = CVAR_INIT ("ps_descriptor", "Average", NULL, 0, ps_descriptor_cons_t, NULL);
-consvar_t cv_freedemocamera = CVAR_INIT("freedemocamera", "Off", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_freedemocamera = CVAR_INIT("freedemocamera", "Off", NULL, CV_SAVE, CV_OnOff, NULL);
// NOTE: this should be in hw_main.c, but we can't put it there as it breaks dedicated build
-consvar_t cv_glallowshaders = CVAR_INIT ("gr_allowcustomshaders", "On", CV_NETVAR, CV_OnOff, NULL);
+consvar_t cv_glallowshaders = CVAR_INIT ("gr_allowcustomshaders", "On", "If on, clients are allowed to use custom OpenGL shaders", CV_NETVAR, CV_OnOff, NULL);
char timedemo_name[256];
boolean timedemo_csv;
@@ -478,62 +475,62 @@ void D_RegisterServerCommands(void)
RegisterNetXCmd(XD_LUAFILE, Got_LuaFile);
// Remote Administration
- COM_AddCommand("password", Command_Changepassword_f, COM_LUA);
- COM_AddCommand("clearpassword", Command_Clearpassword_f, COM_LUA);
- COM_AddCommand("login", Command_Login_f, COM_LUA); // useful in dedicated to kick off remote admin
- COM_AddCommand("promote", Command_Verify_f, COM_LUA);
+ COM_AddCommand("password", "Add an administrator password", Command_Changepassword_f, COM_LUA);
+ COM_AddCommand("clearpassword", "Remove all administrator passwords", Command_Clearpassword_f, COM_LUA);
+ COM_AddCommand("login", "Login as an admin using a password", Command_Login_f, COM_LUA); // useful in dedicated to kick off remote admin
+ COM_AddCommand("promote", "Promote a player on the server to an admin", Command_Verify_f, COM_LUA);
RegisterNetXCmd(XD_VERIFIED, Got_Verification);
- COM_AddCommand("demote", Command_RemoveAdmin_f, COM_LUA);
+ COM_AddCommand("demote", "Demote an admin on the server", Command_RemoveAdmin_f, COM_LUA);
RegisterNetXCmd(XD_DEMOTED, Got_Removal);
- COM_AddCommand("motd", Command_MotD_f, COM_LUA);
+ COM_AddCommand("motd", "Set a message to display on join", Command_MotD_f, COM_LUA);
RegisterNetXCmd(XD_SETMOTD, Got_MotD_f); // For remote admin
RegisterNetXCmd(XD_TEAMCHANGE, Got_Teamchange);
- COM_AddCommand("serverchangeteam", Command_ServerTeamChange_f, COM_LUA);
+ COM_AddCommand("serverchangeteam", "Force a player to switch to another team", Command_ServerTeamChange_f, COM_LUA);
RegisterNetXCmd(XD_MUTEPLAYER, Got_MutePlayer);
- COM_AddCommand("muteplayer", Command_MutePlayer_f, COM_LUA);
- COM_AddCommand("unmuteplayer", Command_UnmutePlayer_f, COM_LUA);
+ COM_AddCommand("muteplayer", "Mute a player", Command_MutePlayer_f, COM_LUA);
+ COM_AddCommand("unmuteplayer", "Unmute a player", Command_UnmutePlayer_f, COM_LUA);
RegisterNetXCmd(XD_CLEARSCORES, Got_Clearscores);
- COM_AddCommand("clearscores", Command_Clearscores_f, COM_LUA);
- COM_AddCommand("map", Command_Map_f, COM_LUA);
+ COM_AddCommand("clearscores", NULL, Command_Clearscores_f, COM_LUA);
+ COM_AddCommand("map", "Warp to a map", Command_Map_f, COM_LUA);
- COM_AddCommand("exitgame", Command_ExitGame_f, COM_LUA);
- COM_AddCommand("retry", Command_Retry_f, COM_LUA);
- COM_AddCommand("exitlevel", Command_ExitLevel_f, COM_LUA);
- COM_AddCommand("showmap", Command_Showmap_f, COM_LUA);
- COM_AddCommand("mapmd5", Command_Mapmd5_f, COM_LUA);
+ COM_AddCommand("exitgame", "End the current game and return to the title screen", Command_ExitGame_f, COM_LUA);
+ COM_AddCommand("retry", "Restart from last checkpoint", Command_Retry_f, COM_LUA);
+ COM_AddCommand("exitlevel", "End the current map", Command_ExitLevel_f, COM_LUA);
+ COM_AddCommand("showmap", "Show information about the currently played map", Command_Showmap_f, COM_LUA);
+ COM_AddCommand("mapmd5", "Print the MD5 hash of the current map", Command_Mapmd5_f, COM_LUA);
- COM_AddCommand("addfolder", Command_Addfolder, COM_LUA);
- COM_AddCommand("addfile", Command_Addfile, COM_LUA);
- COM_AddCommand("listwad", Command_ListWADS_f, COM_LUA);
+ COM_AddCommand("addfolder", NULL, Command_Addfolder, COM_LUA);
+ COM_AddCommand("addfile", "Load an addon", Command_Addfile, COM_LUA);
+ COM_AddCommand("listwad", "List currently loaded addons", Command_ListWADS_f, COM_LUA);
- COM_AddCommand("runsoc", Command_RunSOC, COM_LUA);
- COM_AddCommand("pause", Command_Pause, COM_LUA);
- COM_AddCommand("suicide", Command_Suicide, COM_LUA);
+ COM_AddCommand("runsoc", "Run an SOC file", Command_RunSOC, COM_LUA);
+ COM_AddCommand("pause", "Pause or unpause the game", Command_Pause, COM_LUA);
+ COM_AddCommand("suicide", NULL, Command_Suicide, COM_LUA);
- COM_AddCommand("gametype", Command_ShowGametype_f, COM_LUA);
- COM_AddCommand("version", Command_Version_f, COM_LUA);
+ COM_AddCommand("gametype", "Print the current gametype", Command_ShowGametype_f, COM_LUA);
+ COM_AddCommand("version", "Print information about the current build", Command_Version_f, COM_LUA);
#ifdef UPDATE_ALERT
- COM_AddCommand("mod_details", Command_ModDetails_f, COM_LUA);
+ COM_AddCommand("mod_details", NULL, Command_ModDetails_f, COM_LUA);
#endif
- COM_AddCommand("quit", Command_Quit_f, COM_LUA);
-
- COM_AddCommand("saveconfig", Command_SaveConfig_f, 0);
- COM_AddCommand("loadconfig", Command_LoadConfig_f, 0);
- COM_AddCommand("changeconfig", Command_ChangeConfig_f, 0);
- COM_AddCommand("isgamemodified", Command_Isgamemodified_f, COM_LUA); // test
- COM_AddCommand("showscores", Command_ShowScores_f, COM_LUA);
- COM_AddCommand("showtime", Command_ShowTime_f, COM_LUA);
- COM_AddCommand("cheats", Command_Cheats_f, COM_LUA); // test
+ COM_AddCommand("quit", "Close the game", Command_Quit_f, COM_LUA);
+
+ COM_AddCommand("saveconfig", "Save the current configuration", Command_SaveConfig_f, 0);
+ COM_AddCommand("loadconfig", "Load game configuration anew", Command_LoadConfig_f, 0);
+ COM_AddCommand("changeconfig", NULL, Command_ChangeConfig_f, 0);
+ COM_AddCommand("isgamemodified", NULL, Command_Isgamemodified_f, COM_LUA); // test
+ COM_AddCommand("showscores", "Show player scores", Command_ShowScores_f, COM_LUA);
+ COM_AddCommand("showtime", "Show map time", Command_ShowTime_f, COM_LUA);
+ COM_AddCommand("cheats", "Show or toggle cheats", Command_Cheats_f, COM_LUA); // test
#ifdef _DEBUG
- COM_AddCommand("togglemodified", Command_Togglemodified_f, COM_LUA);
- COM_AddCommand("archivetest", Command_Archivetest_f, COM_LUA);
+ COM_AddCommand("togglemodified", NULL, Command_Togglemodified_f, COM_LUA);
+ COM_AddCommand("archivetest", NULL, Command_Archivetest_f, COM_LUA);
#endif
- COM_AddCommand("downloads", Command_Downloads_f, COM_LUA);
+ COM_AddCommand("downloads", "List active in-game downloads", Command_Downloads_f, COM_LUA);
// for master server connection
AddMServCommands();
@@ -623,7 +620,7 @@ void D_RegisterServerCommands(void)
CV_RegisterVar(&cv_idleaction);
CV_RegisterVar(&cv_httpsource);
- COM_AddCommand("ping", Command_Ping_f, COM_LUA);
+ COM_AddCommand("ping", NULL, Command_Ping_f, COM_LUA);
CV_RegisterVar(&cv_nettimeout);
CV_RegisterVar(&cv_jointimeout);
@@ -682,26 +679,26 @@ void D_RegisterClientCommands(void)
if (dedicated)
return;
- COM_AddCommand("numthinkers", Command_Numthinkers_f, COM_LUA);
- COM_AddCommand("countmobjs", Command_CountMobjs_f, COM_LUA);
+ COM_AddCommand("numthinkers", "List number of thinkers currently present", Command_Numthinkers_f, COM_LUA);
+ COM_AddCommand("countmobjs", NULL, Command_CountMobjs_f, COM_LUA);
- COM_AddCommand("changeteam", Command_Teamchange_f, COM_LUA);
- COM_AddCommand("changeteam2", Command_Teamchange2_f, COM_LUA);
+ COM_AddCommand("changeteam", "Change to a different team", Command_Teamchange_f, COM_LUA);
+ COM_AddCommand("changeteam2", "Change player 2 to a different team", Command_Teamchange2_f, COM_LUA);
- COM_AddCommand("playdemo", Command_Playdemo_f, 0);
- COM_AddCommand("timedemo", Command_Timedemo_f, 0);
- COM_AddCommand("stopdemo", Command_Stopdemo_f, COM_LUA);
- COM_AddCommand("playintro", Command_Playintro_f, COM_LUA);
+ COM_AddCommand("playdemo", NULL, Command_Playdemo_f, 0);
+ COM_AddCommand("timedemo", NULL, Command_Timedemo_f, 0);
+ COM_AddCommand("stopdemo", NULL, Command_Stopdemo_f, COM_LUA);
+ COM_AddCommand("playintro", NULL, Command_Playintro_f, COM_LUA);
CV_RegisterVar(&cv_resyncdemo);
- COM_AddCommand("resetcamera", Command_ResetCamera_f, COM_LUA);
+ COM_AddCommand("resetcamera", "Reset camera Y position", Command_ResetCamera_f, COM_LUA);
- COM_AddCommand("setcontrol", Command_Setcontrol_f, 0);
- COM_AddCommand("setcontrol2", Command_Setcontrol2_f, 0);
+ COM_AddCommand("setcontrol", "Bind an action to a button", Command_Setcontrol_f, 0);
+ COM_AddCommand("setcontrol2", "Bind an action to a button for player 2", Command_Setcontrol2_f, 0);
- COM_AddCommand("screenshot", M_ScreenShot, COM_LUA);
- COM_AddCommand("startmovie", Command_StartMovie_f, COM_LUA);
- COM_AddCommand("stopmovie", Command_StopMovie_f, COM_LUA);
+ COM_AddCommand("screenshot", "Take a screenshot", M_ScreenShot, COM_LUA);
+ COM_AddCommand("startmovie", "Start a GIF/APNG recording", Command_StartMovie_f, COM_LUA);
+ COM_AddCommand("stopmovie", "Stop a GIF/APNG recording", Command_StopMovie_f, COM_LUA);
CV_RegisterVar(&cv_screenshot_option);
CV_RegisterVar(&cv_screenshot_folder);
@@ -764,7 +761,7 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_ghost_last);
CV_RegisterVar(&cv_ghost_guest);
- COM_AddCommand("displayplayer", Command_Displayplayer_f, COM_LUA);
+ COM_AddCommand("displayplayer", NULL, Command_Displayplayer_f, COM_LUA);
// FIXME: not to be here.. but needs be done for config loading
CV_RegisterVar(&cv_globalgamma);
@@ -922,8 +919,8 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_ps_descriptor);
// ingame object placing
- COM_AddCommand("objectplace", Command_ObjectPlace_f, COM_LUA);
- COM_AddCommand("writethings", Command_Writethings_f, COM_LUA);
+ COM_AddCommand("objectplace", "Toggle object placement mode", Command_ObjectPlace_f, COM_LUA);
+ COM_AddCommand("writethings", "Write mapthing placement to WAD file", Command_Writethings_f, COM_LUA);
CV_RegisterVar(&cv_speed);
CV_RegisterVar(&cv_opflags);
CV_RegisterVar(&cv_ophoopflags);
@@ -932,32 +929,32 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_freedemocamera);
// add cheat commands
- COM_AddCommand("noclip", Command_CheatNoClip_f, COM_LUA);
- COM_AddCommand("god", Command_CheatGod_f, COM_LUA);
- COM_AddCommand("notarget", Command_CheatNoTarget_f, COM_LUA);
- COM_AddCommand("getallemeralds", Command_Getallemeralds_f, COM_LUA);
- COM_AddCommand("resetemeralds", Command_Resetemeralds_f, COM_LUA);
- COM_AddCommand("setrings", Command_Setrings_f, COM_LUA);
- COM_AddCommand("setlives", Command_Setlives_f, COM_LUA);
- COM_AddCommand("setcontinues", Command_Setcontinues_f, COM_LUA);
- COM_AddCommand("devmode", Command_Devmode_f, COM_LUA);
- COM_AddCommand("savecheckpoint", Command_Savecheckpoint_f, COM_LUA);
- COM_AddCommand("scale", Command_Scale_f, COM_LUA);
- COM_AddCommand("gravflip", Command_Gravflip_f, COM_LUA);
- COM_AddCommand("hurtme", Command_Hurtme_f, COM_LUA);
- COM_AddCommand("jumptoaxis", Command_JumpToAxis_f, COM_LUA);
- COM_AddCommand("charability", Command_Charability_f, COM_LUA);
- COM_AddCommand("charspeed", Command_Charspeed_f, COM_LUA);
- COM_AddCommand("teleport", Command_Teleport_f, COM_LUA);
- COM_AddCommand("rteleport", Command_RTeleport_f, COM_LUA);
- COM_AddCommand("skynum", Command_Skynum_f, COM_LUA);
- COM_AddCommand("weather", Command_Weather_f, COM_LUA);
- COM_AddCommand("toggletwod", Command_Toggletwod_f, COM_LUA);
+ COM_AddCommand("noclip", "Disable world clipping", Command_CheatNoClip_f, COM_LUA);
+ COM_AddCommand("god", "Make yourself invulnerable to all damage", Command_CheatGod_f, COM_LUA);
+ COM_AddCommand("notarget", "Make yourself invisible to badniks", Command_CheatNoTarget_f, COM_LUA);
+ COM_AddCommand("getallemeralds", "Give yourself all 7 emeralds", Command_Getallemeralds_f, COM_LUA);
+ COM_AddCommand("resetemeralds", "Reset all your emeralds to 0", Command_Resetemeralds_f, COM_LUA);
+ COM_AddCommand("setrings", "Set the amount of rings", Command_Setrings_f, COM_LUA);
+ COM_AddCommand("setlives", "Set the amount of lives", Command_Setlives_f, COM_LUA);
+ COM_AddCommand("setcontinues", "Set the amount of continues", Command_Setcontinues_f, COM_LUA);
+ COM_AddCommand("devmode", "Enabled debugging information", Command_Devmode_f, COM_LUA);
+ COM_AddCommand("savecheckpoint", "Save current player position", Command_Savecheckpoint_f, COM_LUA);
+ COM_AddCommand("scale", "Set player size", Command_Scale_f, COM_LUA);
+ COM_AddCommand("gravflip", "Flip player gravity", Command_Gravflip_f, COM_LUA);
+ COM_AddCommand("hurtme", "Damage yourself", Command_Hurtme_f, COM_LUA);
+ COM_AddCommand("jumptoaxis", NULL, Command_JumpToAxis_f, COM_LUA);
+ COM_AddCommand("charability", "Set player ability", Command_Charability_f, COM_LUA);
+ COM_AddCommand("charspeed", "Set player speed", Command_Charspeed_f, COM_LUA);
+ COM_AddCommand("teleport", "Teleport to a location", Command_Teleport_f, COM_LUA);
+ COM_AddCommand("rteleport", "Teleport relative to your location", Command_RTeleport_f, COM_LUA);
+ COM_AddCommand("skynum", "Set skybox texture", Command_Skynum_f, COM_LUA);
+ COM_AddCommand("weather", "Set current weather", Command_Weather_f, COM_LUA);
+ COM_AddCommand("toggletwod", "Toggle 2D mode", Command_Toggletwod_f, COM_LUA);
#ifdef _DEBUG
- COM_AddCommand("causecfail", Command_CauseCfail_f, COM_LUA);
+ COM_AddCommand("causecfail", NULL, Command_CauseCfail_f, COM_LUA);
#endif
#ifdef LUA_ALLOW_BYTECODE
- COM_AddCommand("dumplua", Command_Dumplua_f, COM_LUA);
+ COM_AddCommand("dumplua", NULL, Command_Dumplua_f, COM_LUA);
#endif
}
diff --git a/src/netcode/d_netfil.c b/src/netcode/d_netfil.c
index 25290990789988be750ae5cdd41986c628f59ebf..de354f0df6ad394da219e50bfabd03ea5f93e464 100644
--- a/src/netcode/d_netfil.c
+++ b/src/netcode/d_netfil.c
@@ -130,13 +130,12 @@ char luafiledir[256 + 16] = "luafiles";
// max file size to send to a player (in kilobytes)
static CV_PossibleValue_t maxsend_cons_t[] = {{0, "MIN"}, {204800, "MAX"}, {0, NULL}};
-consvar_t cv_maxsend = CVAR_INIT ("maxsend", "4096", CV_SAVE|CV_NETVAR, maxsend_cons_t, NULL);
+consvar_t cv_maxsend = CVAR_INIT ("maxsend", "4096", "Maximum allowed amount of data to send to clients, in kB", CV_SAVE|CV_NETVAR, maxsend_cons_t, NULL);
-consvar_t cv_noticedownload = CVAR_INIT ("noticedownload", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
+consvar_t cv_noticedownload = CVAR_INIT ("noticedownload", "Off", "Log when a file is being transmitted via in-game download to a client", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
-// Speed of file downloading (in packets per tic)
static CV_PossibleValue_t downloadspeed_cons_t[] = {{1, "MIN"}, {300, "MAX"}, {0, NULL}};
-consvar_t cv_downloadspeed = CVAR_INIT ("downloadspeed", "16", CV_SAVE|CV_NETVAR, downloadspeed_cons_t, NULL);
+consvar_t cv_downloadspeed = CVAR_INIT ("downloadspeed", "16", "Amount of download packets to send to clients per tic", CV_SAVE|CV_NETVAR, downloadspeed_cons_t, NULL);
static UINT16 GetWadNumFromFileNeededId(UINT8 id)
{
diff --git a/src/netcode/gamestate.c b/src/netcode/gamestate.c
index 967e23650e141fd231a9a740588cc822b6b00c0b..b8bd6e46a7491f8c1dc45f6e6aacf225d26f6844 100644
--- a/src/netcode/gamestate.c
+++ b/src/netcode/gamestate.c
@@ -117,7 +117,7 @@ void SV_SendSaveGame(INT32 node, boolean resending)
#ifdef DUMPCONSISTENCY
#define TMPSAVENAME "badmath.sav"
-static consvar_t cv_dumpconsistency = CVAR_INIT ("dumpconsistency", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
+static consvar_t cv_dumpconsistency = CVAR_INIT ("dumpconsistency", "Off", NULL, CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
void SV_SavedGame(void)
{
diff --git a/src/netcode/http-mserv.c b/src/netcode/http-mserv.c
index 0fe1e9934265c301c78e77c9650ea952c61cc68d..bbd6fd715a684ab271d88f8ea082a186821b3fee 100644
--- a/src/netcode/http-mserv.c
+++ b/src/netcode/http-mserv.c
@@ -41,23 +41,11 @@ Documentation available here.
static void MasterServer_Debug_OnChange (void);
-consvar_t cv_masterserver_timeout = CVAR_INIT
-(
- "masterserver_timeout", "5", CV_SAVE, CV_Unsigned,
- NULL
-);
-
-consvar_t cv_masterserver_debug = CVAR_INIT
-(
- "masterserver_debug", "Off", CV_SAVE|CV_CALL, CV_OnOff,
- MasterServer_Debug_OnChange
-);
-
-consvar_t cv_masterserver_token = CVAR_INIT
-(
- "masterserver_token", "", CV_SAVE, NULL,
- NULL
-);
+consvar_t cv_masterserver_timeout = CVAR_INIT("masterserver_timeout", "5", "Seconds to wait until a master server update is cancelled", CV_SAVE, CV_Unsigned, NULL);
+
+consvar_t cv_masterserver_debug = CVAR_INIT("masterserver_debug", "Off", NULL, CV_SAVE|CV_CALL, CV_OnOff, MasterServer_Debug_OnChange);
+
+consvar_t cv_masterserver_token = CVAR_INIT("masterserver_token", "", NULL, CV_SAVE, NULL, NULL);
#ifdef MASTERSERVER
diff --git a/src/netcode/mserv.c b/src/netcode/mserv.c
index f17db4b6e32e59a08a7ac5c9c3a44e867c0ffff2..5542cfbca2275ab45016f84a19141753529b87f1 100644
--- a/src/netcode/mserv.c
+++ b/src/netcode/mserv.c
@@ -63,12 +63,12 @@ static CV_PossibleValue_t masterserver_update_rate_cons_t[] = {
{0,NULL}
};
-consvar_t cv_masterserver = CVAR_INIT ("masterserver", "https://ds.ms.srb2.org/MS/0", CV_SAVE|CV_CALL, NULL, MasterServer_OnChange);
-consvar_t cv_servername = CVAR_INIT_WITH_CALLBACKS ("servername", "SRB2 server", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, NULL, Update_parameters, ServerName_CanChange);
+consvar_t cv_masterserver = CVAR_INIT ("masterserver", "https://ds.ms.srb2.org/MS/0", "URL to the master server", CV_SAVE|CV_CALL, NULL, MasterServer_OnChange);
+consvar_t cv_servername = CVAR_INIT_WITH_CALLBACKS ("servername", "SRB2 server", "Name of the server as displayed on the server listing", CV_SAVE|CV_CALL|CV_NOINIT|CV_ALLOWLUA, NULL, Update_parameters, ServerName_CanChange);
-consvar_t cv_masterserver_update_rate = CVAR_INIT ("masterserver_update_rate", "15", CV_SAVE|CV_CALL|CV_NOINIT, masterserver_update_rate_cons_t, Update_parameters);
+consvar_t cv_masterserver_update_rate = CVAR_INIT ("masterserver_update_rate", "15", "Frequency, in minutes, to update the master server entry", CV_SAVE|CV_CALL|CV_NOINIT, masterserver_update_rate_cons_t, Update_parameters);
CV_PossibleValue_t cv_masterserver_room_values[] = {{-1, "MIN"}, {999999999, "MAX"}, {0, NULL}};
-consvar_t cv_masterserver_room_id = CVAR_INIT ("masterserver_room_id", "-1", CV_CALL, cv_masterserver_room_values, RoomId_OnChange);
+consvar_t cv_masterserver_room_id = CVAR_INIT ("masterserver_room_id", "-1", "What room ID to display your server on", CV_CALL, cv_masterserver_room_values, RoomId_OnChange);
static INT16 ms_RoomId = -1;
@@ -101,8 +101,8 @@ void AddMServCommands(void)
CV_RegisterVar(&cv_masterserver_token);
CV_RegisterVar(&cv_servername);
#ifdef MASTERSERVER
- COM_AddCommand("listserv", Command_Listserv_f, 0);
- COM_AddCommand("masterserver_update", Update_parameters, COM_LUA); // allows people to updates manually in case you were delisted by accident
+ COM_AddCommand("listserv", "List servers registered on the master server", Command_Listserv_f, 0);
+ COM_AddCommand("masterserver_update", "Send a server update to the master server", Update_parameters, COM_LUA); // allows people to updates manually in case you were delisted by accident
#endif
}
diff --git a/src/netcode/server_connection.c b/src/netcode/server_connection.c
index f4601e4acac08a187b982f8e286e9e53d46b2396..32fba441c7c988f8c90e221ecae60026c63e3432 100644
--- a/src/netcode/server_connection.c
+++ b/src/netcode/server_connection.c
@@ -37,18 +37,18 @@ tic_t joindelay = 0;
// The actual timeout will be longer depending on the savegame length
char playeraddress[MAXPLAYERS][64];
-consvar_t cv_showjoinaddress = CVAR_INIT ("showjoinaddress", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
+consvar_t cv_showjoinaddress = CVAR_INIT ("showjoinaddress", "Off", "Log the IP address of joining players on the server", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
-consvar_t cv_allownewplayer = CVAR_INIT ("allowjoin", "On", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_allownewplayer = CVAR_INIT ("allowjoin", "On", "If players are allowed to join the server", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
static CV_PossibleValue_t maxplayers_cons_t[] = {{2, "MIN"}, {32, "MAX"}, {0, NULL}};
-consvar_t cv_maxplayers = CVAR_INIT ("maxplayers", "8", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, maxplayers_cons_t, NULL);
+consvar_t cv_maxplayers = CVAR_INIT ("maxplayers", "8", "Maximum amount of players allowed on the server", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, maxplayers_cons_t, NULL);
static CV_PossibleValue_t joindelay_cons_t[] = {{1, "MIN"}, {3600, "MAX"}, {0, "Off"}, {0, NULL}};
-consvar_t cv_joindelay = CVAR_INIT ("joindelay", "10", CV_SAVE|CV_NETVAR, joindelay_cons_t, NULL);
+consvar_t cv_joindelay = CVAR_INIT ("joindelay", "10", NULL, CV_SAVE|CV_NETVAR, joindelay_cons_t, NULL);
static CV_PossibleValue_t rejointimeout_cons_t[] = {{1, "MIN"}, {60 * FRACUNIT, "MAX"}, {0, "Off"}, {0, NULL}};
-consvar_t cv_rejointimeout = CVAR_INIT ("rejointimeout", "2", CV_SAVE|CV_NETVAR|CV_FLOAT, rejointimeout_cons_t, NULL);
+consvar_t cv_rejointimeout = CVAR_INIT ("rejointimeout", "2", "Time, in minutes, a player has to rejoin before their player state is removed", CV_SAVE|CV_NETVAR|CV_FLOAT, rejointimeout_cons_t, NULL);
static INT32 FindRejoinerNum(SINT8 node)
{
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 259bf19d492ac3a33f428b9767dac100b745c4b3..7fb7e962efae65561dd1d4f55437d89f8472f0b4 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -39,7 +39,7 @@
#include "netcode/net_command.h"
static CV_PossibleValue_t CV_BobSpeed[] = {{0, "MIN"}, {4*FRACUNIT, "MAX"}, {0, NULL}};
-consvar_t cv_movebob = CVAR_INIT ("movebob", "0.25", CV_FLOAT|CV_SAVE, CV_BobSpeed, NULL);
+consvar_t cv_movebob = CVAR_INIT ("movebob", "0.25", "How much to move the camera up and down while moving in first-person", CV_FLOAT|CV_SAVE, CV_BobSpeed, NULL);
actioncache_t actioncachehead;
@@ -11339,10 +11339,10 @@ void P_RemoveSavegameMobj(mobj_t *mobj)
}
static CV_PossibleValue_t respawnitemtime_cons_t[] = {{1, "MIN"}, {300, "MAX"}, {0, NULL}};
-consvar_t cv_itemrespawntime = CVAR_INIT ("respawnitemtime", "30", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, respawnitemtime_cons_t, NULL);
-consvar_t cv_itemrespawn = CVAR_INIT ("respawnitem", "On", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_itemrespawntime = CVAR_INIT ("respawnitemtime", "30", NULL, CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, respawnitemtime_cons_t, NULL);
+consvar_t cv_itemrespawn = CVAR_INIT ("respawnitem", "On", NULL, CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
static CV_PossibleValue_t flagtime_cons_t[] = {{0, "MIN"}, {300, "MAX"}, {0, NULL}};
-consvar_t cv_flagtime = CVAR_INIT ("flagtime", "30", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, flagtime_cons_t, NULL);
+consvar_t cv_flagtime = CVAR_INIT ("flagtime", "30", NULL, CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, flagtime_cons_t, NULL);
void P_SpawnPrecipitation(void)
{
diff --git a/src/p_user.c b/src/p_user.c
index ba22808eade2a389dc6c7bf56383fcd6149c033d..b0dd992018d999b198ab90cd7e19ecb048a86042 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -9830,45 +9830,45 @@ static CV_PossibleValue_t CV_CamRotate[] = {{-720, "MIN"}, {720, "MAX"}, {0, NUL
static CV_PossibleValue_t multiplier_cons_t[] = {{0, "MIN"}, {3*FRACUNIT, "MAX"}, {0, NULL}};
static CV_PossibleValue_t campos_cons_t[] = { {INT32_MIN, "MIN"}, {INT32_MAX, "MAX"}, {0, NULL} };
-consvar_t cv_cam_dist = CVAR_INIT ("cam_curdist", "160", CV_FLOAT|CV_ALLOWLUA, campos_cons_t, NULL);
-consvar_t cv_cam_height = CVAR_INIT ("cam_curheight", "25", CV_FLOAT|CV_ALLOWLUA, campos_cons_t, NULL);
-consvar_t cv_cam_still = CVAR_INIT ("cam_still", "Off", CV_ALLOWLUA, CV_OnOff, NULL);
-consvar_t cv_cam_speed = CVAR_INIT ("cam_speed", "0.4", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, CV_CamSpeed, NULL);
-consvar_t cv_cam_rotate = CVAR_INIT ("cam_rotate", "0", CV_CALL|CV_NOINIT|CV_ALLOWLUA, CV_CamRotate, CV_CamRotate_OnChange);
-consvar_t cv_cam_rotspeed = CVAR_INIT ("cam_rotspeed", "10", CV_SAVE|CV_ALLOWLUA, rotation_cons_t, NULL);
-consvar_t cv_cam_turnmultiplier = CVAR_INIT ("cam_turnmultiplier", "0.75", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, multiplier_cons_t, NULL);
-consvar_t cv_cam_orbit = CVAR_INIT ("cam_orbit", "Off", CV_SAVE|CV_ALLOWLUA, CV_OnOff, NULL);
-consvar_t cv_cam_adjust = CVAR_INIT ("cam_adjust", "On", CV_SAVE|CV_ALLOWLUA, CV_OnOff, NULL);
-consvar_t cv_cam2_dist = CVAR_INIT ("cam2_curdist", "160", CV_FLOAT|CV_ALLOWLUA, campos_cons_t, NULL);
-consvar_t cv_cam2_height = CVAR_INIT ("cam2_curheight", "25", CV_FLOAT|CV_ALLOWLUA, campos_cons_t, NULL);
-consvar_t cv_cam2_still = CVAR_INIT ("cam2_still", "Off", CV_ALLOWLUA, CV_OnOff, NULL);
-consvar_t cv_cam2_speed = CVAR_INIT ("cam2_speed", "0.4", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, CV_CamSpeed, NULL);
-consvar_t cv_cam2_rotate = CVAR_INIT ("cam2_rotate", "0", CV_CALL|CV_NOINIT|CV_ALLOWLUA, CV_CamRotate, CV_CamRotate2_OnChange);
-consvar_t cv_cam2_rotspeed = CVAR_INIT ("cam2_rotspeed", "10", CV_SAVE|CV_ALLOWLUA, rotation_cons_t, NULL);
-consvar_t cv_cam2_turnmultiplier = CVAR_INIT ("cam2_turnmultiplier", "0.75", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, multiplier_cons_t, NULL);
-consvar_t cv_cam2_orbit = CVAR_INIT ("cam2_orbit", "Off", CV_SAVE|CV_ALLOWLUA, CV_OnOff, NULL);
-consvar_t cv_cam2_adjust = CVAR_INIT ("cam2_adjust", "On", CV_SAVE|CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_cam_dist = CVAR_INIT ("cam_curdist", "160", NULL, CV_FLOAT|CV_ALLOWLUA, campos_cons_t, NULL);
+consvar_t cv_cam_height = CVAR_INIT ("cam_curheight", "25", NULL, CV_FLOAT|CV_ALLOWLUA, campos_cons_t, NULL);
+consvar_t cv_cam_still = CVAR_INIT ("cam_still", "Off", NULL, CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_cam_speed = CVAR_INIT ("cam_speed", "0.4", NULL, CV_FLOAT|CV_SAVE|CV_ALLOWLUA, CV_CamSpeed, NULL);
+consvar_t cv_cam_rotate = CVAR_INIT ("cam_rotate", "0", NULL, CV_CALL|CV_NOINIT|CV_ALLOWLUA, CV_CamRotate, CV_CamRotate_OnChange);
+consvar_t cv_cam_rotspeed = CVAR_INIT ("cam_rotspeed", "10", NULL, CV_SAVE|CV_ALLOWLUA, rotation_cons_t, NULL);
+consvar_t cv_cam_turnmultiplier = CVAR_INIT ("cam_turnmultiplier", "0.75", NULL, CV_FLOAT|CV_SAVE|CV_ALLOWLUA, multiplier_cons_t, NULL);
+consvar_t cv_cam_orbit = CVAR_INIT ("cam_orbit", "Off", NULL, CV_SAVE|CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_cam_adjust = CVAR_INIT ("cam_adjust", "On", NULL, CV_SAVE|CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_cam2_dist = CVAR_INIT ("cam2_curdist", "160", NULL, CV_FLOAT|CV_ALLOWLUA, campos_cons_t, NULL);
+consvar_t cv_cam2_height = CVAR_INIT ("cam2_curheight", "25", NULL, CV_FLOAT|CV_ALLOWLUA, campos_cons_t, NULL);
+consvar_t cv_cam2_still = CVAR_INIT ("cam2_still", "Off", NULL, CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_cam2_speed = CVAR_INIT ("cam2_speed", "0.4", NULL, CV_FLOAT|CV_SAVE|CV_ALLOWLUA, CV_CamSpeed, NULL);
+consvar_t cv_cam2_rotate = CVAR_INIT ("cam2_rotate", "0", NULL, CV_CALL|CV_NOINIT|CV_ALLOWLUA, CV_CamRotate, CV_CamRotate2_OnChange);
+consvar_t cv_cam2_rotspeed = CVAR_INIT ("cam2_rotspeed", "10", NULL, CV_SAVE|CV_ALLOWLUA, rotation_cons_t, NULL);
+consvar_t cv_cam2_turnmultiplier = CVAR_INIT ("cam2_turnmultiplier", "0.75", NULL, CV_FLOAT|CV_SAVE|CV_ALLOWLUA, multiplier_cons_t, NULL);
+consvar_t cv_cam2_orbit = CVAR_INIT ("cam2_orbit", "Off", NULL, CV_SAVE|CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_cam2_adjust = CVAR_INIT ("cam2_adjust", "On", NULL, CV_SAVE|CV_ALLOWLUA, CV_OnOff, NULL);
// [standard vs simple][p1 or p2]
consvar_t cv_cam_savedist[2][2] = {
{ // standard
- CVAR_INIT ("cam_dist", "192", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, campos_cons_t, CV_UpdateCamDist),
- CVAR_INIT ("cam2_dist", "192", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, campos_cons_t, CV_UpdateCam2Dist),
+ CVAR_INIT ("cam_dist", "192", NULL, CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, campos_cons_t, CV_UpdateCamDist),
+ CVAR_INIT ("cam2_dist", "192", NULL, CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, campos_cons_t, CV_UpdateCam2Dist),
},
{ // simple
- CVAR_INIT ("cam_simpledist", "256", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, campos_cons_t, CV_UpdateCamDist),
- CVAR_INIT ("cam2_simpledist", "256", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, campos_cons_t, CV_UpdateCam2Dist),
+ CVAR_INIT ("cam_simpledist", "256", NULL, CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, campos_cons_t, CV_UpdateCamDist),
+ CVAR_INIT ("cam2_simpledist", "256", NULL, CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, campos_cons_t, CV_UpdateCam2Dist),
}
};
consvar_t cv_cam_saveheight[2][2] = {
{ // standard
- CVAR_INIT ("cam_height", "40", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, campos_cons_t, CV_UpdateCamDist),
- CVAR_INIT ("cam2_height", "40", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, campos_cons_t, CV_UpdateCam2Dist),
+ CVAR_INIT ("cam_height", "40", NULL, CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, campos_cons_t, CV_UpdateCamDist),
+ CVAR_INIT ("cam2_height", "40", NULL, CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, campos_cons_t, CV_UpdateCam2Dist),
},
{ // simple
- CVAR_INIT ("cam_simpleheight", "60", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, campos_cons_t, CV_UpdateCamDist),
- CVAR_INIT ("cam2_simpleheight", "60", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, campos_cons_t, CV_UpdateCam2Dist),
+ CVAR_INIT ("cam_simpleheight", "60", NULL, CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, campos_cons_t, CV_UpdateCamDist),
+ CVAR_INIT ("cam2_simpleheight", "60", NULL, CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, campos_cons_t, CV_UpdateCam2Dist),
}
};
diff --git a/src/r_bbox.c b/src/r_bbox.c
index 93fa2dca28c4a1f923c69ff4f44958c7e583310c..6d61631829c0daa0cd94cef80d65e85c9617e83c 100644
--- a/src/r_bbox.c
+++ b/src/r_bbox.c
@@ -34,9 +34,9 @@ static CV_PossibleValue_t renderhitbox_cons_t[] = {
{RENDERHITBOX_RINGS, "Rings"},
{0}};
-consvar_t cv_renderhitbox = CVAR_INIT ("renderhitbox", "Off", CV_CHEAT|CV_NOTINNET, renderhitbox_cons_t, NULL);
-consvar_t cv_renderhitboxinterpolation = CVAR_INIT ("renderhitbox_interpolation", "On", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_renderhitboxgldepth = CVAR_INIT ("renderhitbox_gldepth", "Off", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_renderhitbox = CVAR_INIT ("renderhitbox", "Off", NULL, CV_CHEAT|CV_NOTINNET, renderhitbox_cons_t, NULL);
+consvar_t cv_renderhitboxinterpolation = CVAR_INIT ("renderhitbox_interpolation", "On", NULL, CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_renderhitboxgldepth = CVAR_INIT ("renderhitbox_gldepth", "Off", NULL, CV_SAVE, CV_OnOff, NULL);
struct bbox_col {
INT32 x;
diff --git a/src/r_fps.c b/src/r_fps.c
index 3d80cf858e8525e884997e192a8b0a073af3ff15..fc814db4a80f6e42053fae0e6ba380aba51c53a8 100644
--- a/src/r_fps.c
+++ b/src/r_fps.c
@@ -39,7 +39,7 @@ static CV_PossibleValue_t fpscap_cons_t[] = {
{0, "Match refresh rate"},
{0, NULL}
};
-consvar_t cv_fpscap = CVAR_INIT ("fpscap", "Match refresh rate", CV_SAVE, fpscap_cons_t, NULL);
+consvar_t cv_fpscap = CVAR_INIT ("fpscap", "Match refresh rate", "Maximum allowed framerate", CV_SAVE, fpscap_cons_t, NULL);
ps_metric_t ps_interp_frac = {0};
ps_metric_t ps_interp_lag = {0};
diff --git a/src/r_main.c b/src/r_main.c
index 63a8836a102dc577d80b43cdb37b22bb8af60fba..44e99e93625530007c0cf718a3b748575a4b03a9 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -145,37 +145,37 @@ static void FlipCam2_OnChange(void);
void SendWeaponPref(void);
void SendWeaponPref2(void);
-consvar_t cv_tailspickup = CVAR_INIT ("tailspickup", "On", CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
-consvar_t cv_chasecam = CVAR_INIT ("chasecam", "On", CV_CALL, CV_OnOff, ChaseCam_OnChange);
-consvar_t cv_chasecam2 = CVAR_INIT ("chasecam2", "On", CV_CALL, CV_OnOff, ChaseCam2_OnChange);
-consvar_t cv_flipcam = CVAR_INIT ("flipcam", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam_OnChange);
-consvar_t cv_flipcam2 = CVAR_INIT ("flipcam2", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam2_OnChange);
-
-consvar_t cv_shadow = CVAR_INIT ("shadow", "On", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_skybox = CVAR_INIT ("skybox", "On", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_allowmlook = CVAR_INIT ("allowmlook", "Yes", CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL);
-consvar_t cv_showhud = CVAR_INIT ("showhud", "Yes", CV_CALL|CV_ALLOWLUA, CV_YesNo, R_SetViewSize);
-consvar_t cv_translucenthud = CVAR_INIT ("translucenthud", "10", CV_SAVE, translucenthud_cons_t, NULL);
-
-consvar_t cv_translucency = CVAR_INIT ("translucency", "On", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_drawdist = CVAR_INIT ("drawdist", "Infinite", CV_SAVE, drawdist_cons_t, NULL);
-consvar_t cv_drawdist_nights = CVAR_INIT ("drawdist_nights", "2048", CV_SAVE, drawdist_cons_t, NULL);
-consvar_t cv_drawdist_precip = CVAR_INIT ("drawdist_precip", "1024", CV_SAVE, drawdist_precip_cons_t, NULL);
-consvar_t cv_fov = CVAR_INIT ("fov", "90", CV_SAVE|CV_FLOAT|CV_CALL, fov_cons_t, Fov_OnChange);
-consvar_t cv_fovadjust = CVAR_INIT ("fovadjust", "On", CV_SAVE|CV_CALL, CV_OnOff, Fov_OnChange);
-consvar_t cv_fovchange = CVAR_INIT ("fovchange", "Off", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_maxportals = CVAR_INIT ("maxportals", "2", CV_SAVE, maxportals_cons_t, NULL);
-
-consvar_t cv_renderview = CVAR_INIT ("renderview", "On", 0, CV_OnOff, NULL);
-consvar_t cv_renderwalls = CVAR_INIT ("r_renderwalls", "On", 0, CV_OnOff, NULL);
-consvar_t cv_renderfloors = CVAR_INIT ("r_renderfloors", "On", 0, CV_OnOff, NULL);
-consvar_t cv_renderthings = CVAR_INIT ("r_renderthings", "On", 0, CV_OnOff, NULL);
-consvar_t cv_ffloorclip = CVAR_INIT ("r_ffloorclip", "On", 0, CV_OnOff, NULL);
-consvar_t cv_spriteclip = CVAR_INIT ("r_spriteclip", "On", 0, CV_OnOff, NULL);
-
-consvar_t cv_homremoval = CVAR_INIT ("homremoval", "No", CV_SAVE, homremoval_cons_t, NULL);
-
-consvar_t cv_renderstats = CVAR_INIT ("renderstats", "Off", 0, CV_OnOff, NULL);
+consvar_t cv_tailspickup = CVAR_INIT ("tailspickup", "On", "If off, players will collide with each other (this does prevent tails from picking up players but it's the worst possible solution to the problem)", CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_chasecam = CVAR_INIT ("chasecam", "On", NULL, CV_CALL, CV_OnOff, ChaseCam_OnChange);
+consvar_t cv_chasecam2 = CVAR_INIT ("chasecam2", "On", NULL, CV_CALL, CV_OnOff, ChaseCam2_OnChange);
+consvar_t cv_flipcam = CVAR_INIT ("flipcam", "No", NULL, CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam_OnChange);
+consvar_t cv_flipcam2 = CVAR_INIT ("flipcam2", "No", NULL, CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam2_OnChange);
+
+consvar_t cv_shadow = CVAR_INIT ("shadow", "On", NULL, CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_skybox = CVAR_INIT ("skybox", "On", NULL, CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_allowmlook = CVAR_INIT ("allowmlook", "Yes", NULL, CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL);
+consvar_t cv_showhud = CVAR_INIT ("showhud", "Yes", NULL, CV_CALL|CV_ALLOWLUA, CV_YesNo, R_SetViewSize);
+consvar_t cv_translucenthud = CVAR_INIT ("translucenthud", "10", NULL, CV_SAVE, translucenthud_cons_t, NULL);
+
+consvar_t cv_translucency = CVAR_INIT ("translucency", "On", NULL, CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_drawdist = CVAR_INIT ("drawdist", "Infinite", NULL, CV_SAVE, drawdist_cons_t, NULL);
+consvar_t cv_drawdist_nights = CVAR_INIT ("drawdist_nights", "2048", NULL, CV_SAVE, drawdist_cons_t, NULL);
+consvar_t cv_drawdist_precip = CVAR_INIT ("drawdist_precip", "1024", NULL, CV_SAVE, drawdist_precip_cons_t, NULL);
+consvar_t cv_fov = CVAR_INIT ("fov", "90", NULL, CV_SAVE|CV_FLOAT|CV_CALL, fov_cons_t, Fov_OnChange);
+consvar_t cv_fovadjust = CVAR_INIT ("fovadjust", "On", NULL, CV_SAVE|CV_CALL, CV_OnOff, Fov_OnChange);
+consvar_t cv_fovchange = CVAR_INIT ("fovchange", "Off", NULL, CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_maxportals = CVAR_INIT ("maxportals", "2", NULL, CV_SAVE, maxportals_cons_t, NULL);
+
+consvar_t cv_renderview = CVAR_INIT ("renderview", "On", NULL, 0, CV_OnOff, NULL);
+consvar_t cv_renderwalls = CVAR_INIT ("r_renderwalls", "On", NULL, 0, CV_OnOff, NULL);
+consvar_t cv_renderfloors = CVAR_INIT ("r_renderfloors", "On", NULL, 0, CV_OnOff, NULL);
+consvar_t cv_renderthings = CVAR_INIT ("r_renderthings", "On", NULL, 0, CV_OnOff, NULL);
+consvar_t cv_ffloorclip = CVAR_INIT ("r_ffloorclip", "On", NULL, 0, CV_OnOff, NULL);
+consvar_t cv_spriteclip = CVAR_INIT ("r_spriteclip", "On", NULL, 0, CV_OnOff, NULL);
+
+consvar_t cv_homremoval = CVAR_INIT ("homremoval", "No", NULL, CV_SAVE, homremoval_cons_t, NULL);
+
+consvar_t cv_renderstats = CVAR_INIT ("renderstats", "Off", NULL, 0, CV_OnOff, NULL);
void SplitScreen_OnChange(void)
{
diff --git a/src/s_sound.c b/src/s_sound.c
index 5fb7fa40b569e7a66bb171dedc900606aef6ccc5..caae99124fa36cf2871cfbd3082d3af43a8f1f24 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -62,21 +62,20 @@ static boolean S_CheckQueue(void);
#endif
#ifdef _WINDOWS
-consvar_t cv_samplerate = CVAR_INIT ("samplerate", "44100", 0, CV_Unsigned, NULL); //Alam: For easy hacking?
+consvar_t cv_samplerate = CVAR_INIT ("samplerate", "44100", "Audio sample rate", 0, CV_Unsigned, NULL); //Alam: For easy hacking?
#else
-consvar_t cv_samplerate = CVAR_INIT ("samplerate", "22050", 0, CV_Unsigned, NULL); //Alam: For easy hacking?
+consvar_t cv_samplerate = CVAR_INIT ("samplerate", "22050", "Audio sample rate", 0, CV_Unsigned, NULL); //Alam: For easy hacking?
#endif
// stereo reverse
-consvar_t stereoreverse = CVAR_INIT ("stereoreverse", "Off", CV_SAVE, CV_OnOff, NULL);
+consvar_t stereoreverse = CVAR_INIT ("stereoreverse", "Off", NULL, CV_SAVE, CV_OnOff, NULL);
-// if true, all sounds are loaded at game startup
-static consvar_t precachesound = CVAR_INIT ("precachesound", "Off", CV_SAVE, CV_OnOff, NULL);
+static consvar_t precachesound = CVAR_INIT ("precachesound", "Off", "If on, load all sounds at startup", CV_SAVE, CV_OnOff, NULL);
// actual general (maximum) sound & music volume, saved into the config
-consvar_t cv_soundvolume = CVAR_INIT ("soundvolume", "16", CV_SAVE, soundvolume_cons_t, NULL);
-consvar_t cv_digmusicvolume = CVAR_INIT ("digmusicvolume", "16", CV_SAVE, soundvolume_cons_t, NULL);
-consvar_t cv_midimusicvolume = CVAR_INIT ("midimusicvolume", "16", CV_SAVE, soundvolume_cons_t, NULL);
+consvar_t cv_soundvolume = CVAR_INIT ("soundvolume", "16", "Volume of in-game sounds", CV_SAVE, soundvolume_cons_t, NULL);
+consvar_t cv_digmusicvolume = CVAR_INIT ("digmusicvolume", "16", "Volume of digital music", CV_SAVE, soundvolume_cons_t, NULL);
+consvar_t cv_midimusicvolume = CVAR_INIT ("midimusicvolume", "16", "Volume of MIDI music", CV_SAVE, soundvolume_cons_t, NULL);
static void Captioning_OnChange(void)
{
@@ -85,27 +84,27 @@ static void Captioning_OnChange(void)
S_StartSound(NULL, sfx_menu1);
}
-consvar_t cv_closedcaptioning = CVAR_INIT ("closedcaptioning", "Off", CV_SAVE|CV_CALL, CV_OnOff, Captioning_OnChange);
+consvar_t cv_closedcaptioning = CVAR_INIT ("closedcaptioning", "Off", "If on, display a textual description for each played sound", CV_SAVE|CV_CALL, CV_OnOff, Captioning_OnChange);
// number of channels available
-consvar_t cv_numChannels = CVAR_INIT ("snd_channels", "32", CV_SAVE|CV_CALL, CV_Unsigned, SetChannelsNum);
+consvar_t cv_numChannels = CVAR_INIT ("snd_channels", "32", NULL, CV_SAVE|CV_CALL, CV_Unsigned, SetChannelsNum);
-static consvar_t surround = CVAR_INIT ("surround", "Off", CV_SAVE, CV_OnOff, NULL);
+static consvar_t surround = CVAR_INIT ("surround", "Off", NULL, CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_resetmusic = CVAR_INIT ("resetmusic", "Off", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_resetmusicbyheader = CVAR_INIT ("resetmusicbyheader", "Yes", CV_SAVE, CV_YesNo, NULL);
+consvar_t cv_resetmusic = CVAR_INIT ("resetmusic", "Off", NULL, CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_resetmusicbyheader = CVAR_INIT ("resetmusicbyheader", "Yes", NULL, CV_SAVE, CV_YesNo, NULL);
static CV_PossibleValue_t cons_1upsound_t[] = {
{0, "Jingle"},
{1, "Sound"},
{0, NULL}
};
-consvar_t cv_1upsound = CVAR_INIT ("1upsound", "Jingle", CV_SAVE, cons_1upsound_t, NULL);
+consvar_t cv_1upsound = CVAR_INIT ("1upsound", "Jingle", "Type of sound to play when getting a 1-up", CV_SAVE, cons_1upsound_t, NULL);
// Sound system toggles, saved into the config
-consvar_t cv_gamedigimusic = CVAR_INIT ("digimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameDigiMusic_OnChange);
-consvar_t cv_gamemidimusic = CVAR_INIT ("midimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameMIDIMusic_OnChange);
-consvar_t cv_gamesounds = CVAR_INIT ("sounds", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameSounds_OnChange);
+consvar_t cv_gamedigimusic = CVAR_INIT ("digimusic", "On", "Enables digital music", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameDigiMusic_OnChange);
+consvar_t cv_gamemidimusic = CVAR_INIT ("midimusic", "On", "Enables MIDI music", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameMIDIMusic_OnChange);
+consvar_t cv_gamesounds = CVAR_INIT ("sounds", "On", "Enables sound effects", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameSounds_OnChange);
// Music preference
static CV_PossibleValue_t cons_musicpref_t[] = {
@@ -113,16 +112,16 @@ static CV_PossibleValue_t cons_musicpref_t[] = {
{1, "MIDI"},
{0, NULL}
};
-consvar_t cv_musicpref = CVAR_INIT ("musicpref", "Digital", CV_SAVE|CV_CALL|CV_NOINIT, cons_musicpref_t, MusicPref_OnChange);
+consvar_t cv_musicpref = CVAR_INIT ("musicpref", "Digital", "What music format to prefer, if both are available", CV_SAVE|CV_CALL|CV_NOINIT, cons_musicpref_t, MusicPref_OnChange);
// Window focus sound sytem toggles
-consvar_t cv_playmusicifunfocused = CVAR_INIT ("playmusicifunfocused", "No", CV_SAVE, CV_YesNo, NULL);
-consvar_t cv_playsoundsifunfocused = CVAR_INIT ("playsoundsifunfocused", "No", CV_SAVE, CV_YesNo, NULL);
+consvar_t cv_playmusicifunfocused = CVAR_INIT ("playmusicifunfocused", "No", "Allows music to play in the background", CV_SAVE, CV_YesNo, NULL);
+consvar_t cv_playsoundsifunfocused = CVAR_INIT ("playsoundsifunfocused", "No", "Allows sound effects to play in the background", CV_SAVE, CV_YesNo, NULL);
#ifdef HAVE_OPENMPT
openmpt_module *openmpt_mhandle = NULL;
static CV_PossibleValue_t interpolationfilter_cons_t[] = {{0, "Default"}, {1, "None"}, {2, "Linear"}, {4, "Cubic"}, {8, "Windowed sinc"}, {0, NULL}};
-consvar_t cv_modfilter = CVAR_INIT ("modfilter", "0", CV_SAVE|CV_CALL, interpolationfilter_cons_t, ModFilter_OnChange);
+consvar_t cv_modfilter = CVAR_INIT ("modfilter", "0", NULL, CV_SAVE|CV_CALL, interpolationfilter_cons_t, ModFilter_OnChange);
#endif
#define S_MAX_VOLUME 127
@@ -289,8 +288,8 @@ void S_RegisterSoundStuff(void)
CV_RegisterVar(&cv_miditimiditypath);
#endif
- COM_AddCommand("tunes", Command_Tunes_f, COM_LUA);
- COM_AddCommand("restartaudio", Command_RestartAudio_f, COM_LUA);
+ COM_AddCommand("tunes", "Check or change the current soundtrack", Command_Tunes_f, COM_LUA);
+ COM_AddCommand("restartaudio", "Restart the audio subsystem", Command_RestartAudio_f, COM_LUA);
}
static void SetChannelsNum(void)
diff --git a/src/screen.c b/src/screen.c
index acb0c55b6337405b48f91049a985655997495423..487c51286eca919bd18172bea1db30e15a90595b 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -87,11 +87,11 @@ INT32 windowedModes[MAXWINMODES][2] =
static CV_PossibleValue_t scr_depth_cons_t[] = {{8, "8 bits"}, {16, "16 bits"}, {24, "24 bits"}, {32, "32 bits"}, {0, NULL}};
//added : 03-02-98: default screen mode, as loaded/saved in config
-consvar_t cv_scr_width = CVAR_INIT ("scr_width", "1280", CV_SAVE, CV_Unsigned, NULL);
-consvar_t cv_scr_height = CVAR_INIT ("scr_height", "800", CV_SAVE, CV_Unsigned, NULL);
-consvar_t cv_scr_width_w = CVAR_INIT ("scr_width_w", "640", CV_SAVE, CV_Unsigned, NULL);
-consvar_t cv_scr_height_w = CVAR_INIT ("scr_height_w", "400", CV_SAVE, CV_Unsigned, NULL);
-consvar_t cv_scr_depth = CVAR_INIT ("scr_depth", "16 bits", CV_SAVE, scr_depth_cons_t, NULL);
+consvar_t cv_scr_width = CVAR_INIT ("scr_width", "1280", NULL, CV_SAVE, CV_Unsigned, NULL);
+consvar_t cv_scr_height = CVAR_INIT ("scr_height", "800", NULL, CV_SAVE, CV_Unsigned, NULL);
+consvar_t cv_scr_width_w = CVAR_INIT ("scr_width_w", "640", NULL, CV_SAVE, CV_Unsigned, NULL);
+consvar_t cv_scr_height_w = CVAR_INIT ("scr_height_w", "400", NULL, CV_SAVE, CV_Unsigned, NULL);
+consvar_t cv_scr_depth = CVAR_INIT ("scr_depth", "16 bits", NULL, CV_SAVE, scr_depth_cons_t, NULL);
CV_PossibleValue_t cv_renderer_t[] = {
{1, "Software"},
@@ -101,11 +101,11 @@ CV_PossibleValue_t cv_renderer_t[] = {
{0, NULL}
};
-consvar_t cv_renderer = CVAR_INIT ("renderer", "Software", CV_SAVE|CV_CALL|CV_NOINIT, cv_renderer_t, SCR_ChangeRenderer);
+consvar_t cv_renderer = CVAR_INIT ("renderer", "Software", "What renderer to use", CV_SAVE|CV_CALL|CV_NOINIT, cv_renderer_t, SCR_ChangeRenderer);
static void SCR_ChangeFullscreen(void);
-consvar_t cv_fullscreen = CVAR_INIT ("fullscreen", "Yes", CV_SAVE|CV_CALL, CV_YesNo, SCR_ChangeFullscreen);
+consvar_t cv_fullscreen = CVAR_INIT ("fullscreen", "Yes", "If on, the game will take up the full screen rather than just a desktop window", CV_SAVE|CV_CALL, CV_YesNo, SCR_ChangeFullscreen);
// =========================================================================
// SCREEN VARIABLES
@@ -605,14 +605,14 @@ void SCR_DisplayTicRate(void)
if (cv_tpscounter.value == 2) // compact counter
{
V_DrawRightAlignedString(vid.width, h-hstep,
- ticcntcolor|V_NOSCALESTART|V_USERHUDTRANS, va("%02d", totaltics));
+ ticcntcolor|V_NOSCALESTART|V_USERHUDTRANS, va("%d", totaltics));
}
else if (cv_tpscounter.value == 1) // full counter
{
V_DrawString(vid.width - ((7 * 8 * vid.dup) + V_StringWidth("TPS: ", V_NOSCALESTART)), h-hstep,
V_YELLOWMAP|V_NOSCALESTART|V_USERHUDTRANS, "TPS: ");
V_DrawRightAlignedString(vid.width, h-hstep,
- ticcntcolor|V_NOSCALESTART|V_USERHUDTRANS, va("%02d/%02u", totaltics, TICRATE));
+ ticcntcolor|V_NOSCALESTART|V_USERHUDTRANS, va("%d/%u", totaltics, TICRATE));
}
lasttic = ontic;
}
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index a2001d1c15cb40bd5754afcdbb0e2ca0538d4fcc..684962a3322e5f0b3a1be14433c0bc5f31a965ce 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -93,9 +93,9 @@ rendermode_t chosenrendermode = render_none; // set by command line arguments
static void VidWaitChanged(void);
// synchronize page flipping with screen refresh
-consvar_t cv_vidwait = CVAR_INIT ("vid_wait", "On", CV_SAVE | CV_CALL, CV_OnOff, VidWaitChanged);
-static consvar_t cv_stretch = CVAR_INIT ("stretch", "Off", CV_SAVE|CV_NOSHOWHELP, CV_OnOff, NULL);
-static consvar_t cv_alwaysgrabmouse = CVAR_INIT ("alwaysgrabmouse", "Off", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_vidwait = CVAR_INIT ("vid_wait", "On", NULL, CV_SAVE | CV_CALL, CV_OnOff, VidWaitChanged);
+static consvar_t cv_stretch = CVAR_INIT ("stretch", "Off", NULL, CV_SAVE|CV_NOSHOWHELP, CV_OnOff, NULL);
+static consvar_t cv_alwaysgrabmouse = CVAR_INIT ("alwaysgrabmouse", "Off", "If on, the game will never let go of the mouse, even when unused", CV_SAVE, CV_OnOff, NULL);
UINT8 graphics_started = 0; // Is used in console.c and screen.c
@@ -1682,12 +1682,12 @@ void I_StartupGraphics(void)
if (graphics_started)
return;
- COM_AddCommand ("vid_nummodes", VID_Command_NumModes_f, COM_LUA);
- COM_AddCommand ("vid_info", VID_Command_Info_f, COM_LUA);
- COM_AddCommand ("vid_modelist", VID_Command_ModeList_f, COM_LUA);
- COM_AddCommand ("vid_mode", VID_Command_Mode_f, 0);
- COM_AddCommand ("vid_width", VID_Command_Width_f, 0);
- COM_AddCommand ("vid_height", VID_Command_Height_f, 0);
+ COM_AddCommand ("vid_nummodes", NULL, VID_Command_NumModes_f, COM_LUA);
+ COM_AddCommand ("vid_info", NULL, VID_Command_Info_f, COM_LUA);
+ COM_AddCommand ("vid_modelist", NULL, VID_Command_ModeList_f, COM_LUA);
+ COM_AddCommand ("vid_mode", NULL, VID_Command_Mode_f, 0);
+ COM_AddCommand ("vid_width", NULL, VID_Command_Width_f, 0);
+ COM_AddCommand ("vid_height", NULL, VID_Command_Height_f, 0);
CV_RegisterVar (&cv_vidwait);
CV_RegisterVar (&cv_stretch);
CV_RegisterVar (&cv_alwaysgrabmouse);
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 0f9983ee1d10d84b20ade3dfa8b208ade4d353ee..fcf07326d34e13630ff685f8be633bf1f700bb32 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -211,9 +211,9 @@ static CV_PossibleValue_t midiplayer_cons_t[] = {
{MIDI_ANY, "Any"},
{0, NULL}
};
-consvar_t cv_midiplayer = CVAR_INIT ("midiplayer", "OPNMIDI" /*MIDI_OPNMIDI*/, CV_CALL|CV_NOINIT|CV_SAVE, midiplayer_cons_t, Midiplayer_Onchange);
-consvar_t cv_midisoundfontpath = CVAR_INIT ("midisoundfont", "sf2/8bitsf.SF2", CV_CALL|CV_NOINIT|CV_SAVE, NULL, MidiSoundfontPath_Onchange);
-consvar_t cv_miditimiditypath = CVAR_INIT ("midisoundbank", "./timidity", CV_SAVE, NULL, NULL);
+consvar_t cv_midiplayer = CVAR_INIT ("midiplayer", "OPNMIDI" /*MIDI_OPNMIDI*/, "Which MIDI player to use", CV_CALL|CV_NOINIT|CV_SAVE, midiplayer_cons_t, Midiplayer_Onchange);
+consvar_t cv_midisoundfontpath = CVAR_INIT ("midisoundfont", "sf2/8bitsf.SF2", "Which MIDI soundfont to use", CV_CALL|CV_NOINIT|CV_SAVE, NULL, MidiSoundfontPath_Onchange);
+consvar_t cv_miditimiditypath = CVAR_INIT ("midisoundbank", "./timidity", NULL, CV_SAVE, NULL, NULL);
#endif
static void var_cleanup(void)
diff --git a/src/v_video.c b/src/v_video.c
index 93a54168990534ed953bc8c8c450a6904c61bd0a..3e2a59a3a7e12b11dadca76410b21a8a76e91672 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -43,46 +43,46 @@ UINT8 *screens[5];
// screens[4] = fade screen end, postimage tempoarary buffer
static CV_PossibleValue_t fpscounter_cons_t[] = {{0, "No"}, {1, "Full"}, {2, "Compact"}, {0, NULL}};
-consvar_t cv_fpscounter = CVAR_INIT ("showfps", "No", CV_SAVE, fpscounter_cons_t, NULL);
-consvar_t cv_tpscounter = CVAR_INIT ("showtps", "No", CV_SAVE, fpscounter_cons_t, NULL);
+consvar_t cv_fpscounter = CVAR_INIT ("showfps", "No", "Displays the current framerate", CV_SAVE, fpscounter_cons_t, NULL);
+consvar_t cv_tpscounter = CVAR_INIT ("showtps", "No", "Displays the current ticrate", CV_SAVE, fpscounter_cons_t, NULL);
static void CV_palette_OnChange(void);
static CV_PossibleValue_t gamma_cons_t[] = {{-15, "MIN"}, {5, "MAX"}, {0, NULL}};
-consvar_t cv_globalgamma = CVAR_INIT ("gamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
+consvar_t cv_globalgamma = CVAR_INIT ("gamma", "0", "Sets the game brightness", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
static CV_PossibleValue_t saturation_cons_t[] = {{0, "MIN"}, {10, "MAX"}, {0, NULL}};
-consvar_t cv_globalsaturation = CVAR_INIT ("saturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
+consvar_t cv_globalsaturation = CVAR_INIT ("saturation", "10", NULL, CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
#define huecoloursteps 4
static CV_PossibleValue_t hue_cons_t[] = {{0, "MIN"}, {(huecoloursteps*6)-1, "MAX"}, {0, NULL}};
-consvar_t cv_rhue = CVAR_INIT ("rhue", "0", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange);
-consvar_t cv_yhue = CVAR_INIT ("yhue", "4", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange);
-consvar_t cv_ghue = CVAR_INIT ("ghue", "8", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange);
-consvar_t cv_chue = CVAR_INIT ("chue", "12", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange);
-consvar_t cv_bhue = CVAR_INIT ("bhue", "16", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange);
-consvar_t cv_mhue = CVAR_INIT ("mhue", "20", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange);
-
-consvar_t cv_rgamma = CVAR_INIT ("rgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
-consvar_t cv_ygamma = CVAR_INIT ("ygamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
-consvar_t cv_ggamma = CVAR_INIT ("ggamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
-consvar_t cv_cgamma = CVAR_INIT ("cgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
-consvar_t cv_bgamma = CVAR_INIT ("bgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
-consvar_t cv_mgamma = CVAR_INIT ("mgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
-
-consvar_t cv_rsaturation = CVAR_INIT ("rsaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
-consvar_t cv_ysaturation = CVAR_INIT ("ysaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
-consvar_t cv_gsaturation = CVAR_INIT ("gsaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
-consvar_t cv_csaturation = CVAR_INIT ("csaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
-consvar_t cv_bsaturation = CVAR_INIT ("bsaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
-consvar_t cv_msaturation = CVAR_INIT ("msaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
+consvar_t cv_rhue = CVAR_INIT ("rhue", "0", NULL, CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange);
+consvar_t cv_yhue = CVAR_INIT ("yhue", "4", NULL, CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange);
+consvar_t cv_ghue = CVAR_INIT ("ghue", "8", NULL, CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange);
+consvar_t cv_chue = CVAR_INIT ("chue", "12", NULL, CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange);
+consvar_t cv_bhue = CVAR_INIT ("bhue", "16", NULL, CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange);
+consvar_t cv_mhue = CVAR_INIT ("mhue", "20", NULL, CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange);
+
+consvar_t cv_rgamma = CVAR_INIT ("rgamma", "0", NULL, CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
+consvar_t cv_ygamma = CVAR_INIT ("ygamma", "0", NULL, CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
+consvar_t cv_ggamma = CVAR_INIT ("ggamma", "0", NULL, CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
+consvar_t cv_cgamma = CVAR_INIT ("cgamma", "0", NULL, CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
+consvar_t cv_bgamma = CVAR_INIT ("bgamma", "0", NULL, CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
+consvar_t cv_mgamma = CVAR_INIT ("mgamma", "0", NULL, CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
+
+consvar_t cv_rsaturation = CVAR_INIT ("rsaturation", "10", NULL, CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
+consvar_t cv_ysaturation = CVAR_INIT ("ysaturation", "10", NULL, CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
+consvar_t cv_gsaturation = CVAR_INIT ("gsaturation", "10", NULL, CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
+consvar_t cv_csaturation = CVAR_INIT ("csaturation", "10", NULL, CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
+consvar_t cv_bsaturation = CVAR_INIT ("bsaturation", "10", NULL, CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
+consvar_t cv_msaturation = CVAR_INIT ("msaturation", "10", NULL, CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
static CV_PossibleValue_t constextsize_cons_t[] = {
{V_NOSCALEPATCH, "Small"}, {V_SMALLSCALEPATCH, "Medium"}, {V_MEDSCALEPATCH, "Large"}, {0, "Huge"},
{0, NULL}};
static void CV_constextsize_OnChange(void);
-consvar_t cv_constextsize = CVAR_INIT ("con_textsize", "Medium", CV_SAVE|CV_CALL, constextsize_cons_t, CV_constextsize_OnChange);
+consvar_t cv_constextsize = CVAR_INIT ("con_textsize", "Medium", "The size of the console text", CV_SAVE|CV_CALL, constextsize_cons_t, CV_constextsize_OnChange);
// local copy of the palette for V_GetColor()
RGBA_t *pLocalPalette = NULL;
diff --git a/src/z_zone.c b/src/z_zone.c
index c0c7d75aad3381d66fe684e92ef6484fcb78dad9..9370bf4e39952f648312bc10300d8bbc9c18a80a 100644
--- a/src/z_zone.c
+++ b/src/z_zone.c
@@ -116,10 +116,10 @@ void Z_Init(void)
CONS_Printf("System memory: %sMB - Free: %sMB\n", sizeu1(total>>20), sizeu2(memfree));
// Note: This allocates memory. Watch out.
- COM_AddCommand("memfree", Command_Memfree_f, COM_LUA);
+ COM_AddCommand("memfree", "Print used and available system memory", Command_Memfree_f, COM_LUA);
#ifdef ZDEBUG
- COM_AddCommand("memdump", Command_Memdump_f, COM_LUA);
+ COM_AddCommand("memdump", NULL, Command_Memdump_f, COM_LUA);
#endif
}