diff --git a/extras/conf/SRB2-22.cfg b/extras/conf/SRB2-22.cfg
index 952ce6969188c0e8e0c2ad27a04d6815942bcd92..ae905b637b334286c58eb339f18b735838c5929d 100644
--- a/extras/conf/SRB2-22.cfg
+++ b/extras/conf/SRB2-22.cfg
@@ -2341,6 +2341,7 @@ linedeftypes
{
title = "Enable/Disable Gravity Flip";
prefix = "(433)";
+ flags2text = "[1] Force MFE_VERTICALFLIP";
flags8text = "[3] Set delay by backside sector";
flags32text = "[5] Invert current gravity";
flags64text = "[6] Return to normal";
diff --git a/extras/conf/udb/Includes/SRB222_linedefs.cfg b/extras/conf/udb/Includes/SRB222_linedefs.cfg
index 99c3056590dbc65135fc3c75c33b68267838674b..3a3bd80cc7f95774ef6380623dd7802c4f8183dd 100644
--- a/extras/conf/udb/Includes/SRB222_linedefs.cfg
+++ b/extras/conf/udb/Includes/SRB222_linedefs.cfg
@@ -4223,6 +4223,16 @@ udmf
1 = "Yes";
}
}
+ arg2
+ {
+ title = "Force MFE_VERTICALFLIP";
+ type = 11;
+ enum
+ {
+ 0 = "No";
+ 1 = "Yes";
+ }
+ }
}
434
diff --git a/src/blua/liolib.c b/src/blua/liolib.c
index e029650c0ced525f3bfc56fc9863d9816f6ebb63..545f9c144c3ba798c96609e4bcb0e6ca22f1f79e 100644
--- a/src/blua/liolib.c
+++ b/src/blua/liolib.c
@@ -24,12 +24,14 @@
#include "../byteptr.h"
#include "../lua_script.h"
#include "../m_misc.h"
+#include "../i_time.h"
#define IO_INPUT 1
#define IO_OUTPUT 2
-#define FILELIMIT (1024 * 1024) // Size limit for reading/writing files
+#define MAXBYTESPERMINUTE (10 * 1024 * 1024) // Rate limit for writing files
+#define MAXOPENSPERMINUTE 50 // Rate limit for opening new files
#define FMT_FILECALLBACKID "file_callback_%d"
@@ -46,6 +48,10 @@ static const char *whitelist[] = {
};
+static INT64 numwrittenbytes = 0;
+static INT64 numopenedfiles = 0;
+
+
static int pushresult (lua_State *L, int i, const char *filename) {
int en = errno; /* calls to Lua API may change this value */
if (i) {
@@ -252,6 +258,17 @@ static int io_openlocal (lua_State *L) {
"Files can't be opened while being downloaded\n",
filename);
+ // Reading not restricted
+ if (client && (strchr(mode, 'w') || strchr(mode, 'a') || strchr(mode, '+')))
+ {
+ if (numopenedfiles >= (I_GetTime() / (60*TICRATE) + 1) * MAXOPENSPERMINUTE)
+ I_Error("Access denied to %s\n"
+ "File opening rate exceeded\n",
+ filename);
+
+ numopenedfiles++;
+ }
+
MakePathDirs(realfilename);
// Open and return the file
@@ -527,9 +544,12 @@ static int g_write (lua_State *L, FILE *f, int arg) {
else {
size_t l;
const char *s = luaL_checklstring(L, arg, &l);
- if (ftell(f) + l > FILELIMIT) {
- luaL_error(L,"write limit bypassed in file. Changes have been discarded.");
- break;
+ if (client) {
+ if (numwrittenbytes + l > (I_GetTime() / (60*TICRATE) + 1) * MAXBYTESPERMINUTE) {
+ luaL_error(L,"file write rate limit exceeded; changes have been discarded");
+ break;
+ }
+ numwrittenbytes += l;
}
status = status && (fwrite(s, sizeof(char), l, f) == l);
}
diff --git a/src/command.c b/src/command.c
index 946b4bc94d15dae5f64a9a88a2de6f12e31c8b11..a34d9694a1c4f5026225780bca1d2e1d47b77c25 100644
--- a/src/command.c
+++ b/src/command.c
@@ -58,6 +58,7 @@ static boolean CV_FilterVarByVersion(consvar_t *v, const char *valstr);
static boolean CV_Command(void);
consvar_t *CV_FindVar(const char *name);
static const char *CV_StringValue(const char *var_name);
+static boolean CV_Immutable(const consvar_t *var);
static consvar_t *consvar_vars; // list of registered console variables
static UINT16 consvar_number_of_netids = 0;
@@ -109,6 +110,7 @@ static cmdalias_t *com_alias; // aliases list
// =========================================================================
static vsbuf_t com_text; // variable sized buffer
+static com_flags_t com_flags = 0;
/** Purges control characters out of some text.
*
@@ -141,7 +143,7 @@ COM_Purge (char *s, int *np)
* \param ptext The text to add.
* \sa COM_BufInsertTextEx
*/
-void COM_BufAddTextEx(const char *ptext, int flags)
+void COM_BufAddTextEx(const char *ptext, com_flags_t flags)
{
int l;
char *text;
@@ -164,7 +166,7 @@ void COM_BufAddTextEx(const char *ptext, int flags)
* \param ptext The text to execute. A newline is automatically added.
* \sa COM_BufAddTextEx
*/
-void COM_BufInsertTextEx(const char *ptext, int flags)
+void COM_BufInsertTextEx(const char *ptext, com_flags_t flags)
{
const INT32 old_wait = com_wait;
@@ -265,6 +267,8 @@ void COM_BufExecute(void)
break;
}
}
+
+ com_flags = 0;
}
/** Executes a string immediately. Used for skirting around WAIT commands.
@@ -309,6 +313,7 @@ typedef struct xcommand_s
const char *name;
struct xcommand_s *next;
com_func_t function;
+ com_flags_t flags;
} xcommand_t;
static xcommand_t *com_commands = NULL; // current commands
@@ -318,7 +323,6 @@ static size_t com_argc;
static char *com_argv[MAX_ARGS];
static const char *com_null_string = "";
static char *com_args = NULL; // current command args or NULL
-static int com_flags;
static void Got_NetVar(UINT8 **p, INT32 playernum);
@@ -330,16 +334,16 @@ void COM_Init(void)
VS_Alloc(&com_text, COM_BUF_SIZE);
// add standard commands
- COM_AddCommand("alias", COM_Alias_f);
- COM_AddCommand("echo", COM_Echo_f);
- COM_AddCommand("cecho", COM_CEcho_f);
- COM_AddCommand("cechoflags", COM_CEchoFlags_f);
- COM_AddCommand("cechoduration", COM_CEchoDuration_f);
- COM_AddCommand("exec", COM_Exec_f);
- COM_AddCommand("wait", COM_Wait_f);
- COM_AddCommand("help", COM_Help_f);
- COM_AddCommand("toggle", COM_Toggle_f);
- COM_AddCommand("add", COM_Add_f);
+ 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("toggle", COM_Toggle_f, COM_LUA);
+ COM_AddCommand("add", COM_Add_f, COM_LUA);
RegisterNetXCmd(XD_NETVAR, Got_NetVar);
}
@@ -441,7 +445,6 @@ static void COM_TokenizeString(char *ptext)
com_argc = 0;
com_args = NULL;
- com_flags = 0;
while (com_argc < MAX_ARGS)
{
@@ -479,7 +482,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)
+void COM_AddCommand(const char *name, com_func_t func, com_flags_t flags)
{
xcommand_t *cmd;
@@ -509,6 +512,7 @@ void COM_AddCommand(const char *name, com_func_t func)
cmd = ZZ_Alloc(sizeof *cmd);
cmd->name = name;
cmd->function = func;
+ cmd->flags = flags;
cmd->next = com_commands;
com_commands = cmd;
}
@@ -541,6 +545,7 @@ int COM_AddLuaCommand(const char *name)
cmd = ZZ_Alloc(sizeof *cmd);
cmd->name = name;
cmd->function = COM_Lua_f;
+ cmd->flags = COM_LUA;
cmd->next = com_commands;
com_commands = cmd;
return 0;
@@ -636,6 +641,12 @@ static void COM_ExecuteString(char *ptext)
{
if (!stricmp(com_argv[0], cmd->name)) //case insensitive now that we have lower and uppercase!
{
+ if ((com_flags & COM_LUA) && !(cmd->flags & COM_LUA))
+ {
+ CONS_Alert(CONS_WARNING, "Command '%s' cannot be run from Lua.\n", cmd->name);
+ return;
+ }
+
cmd->function();
return;
}
@@ -798,8 +809,8 @@ static void COM_Exec_f(void)
CONS_Printf(M_GetText("executing %s\n"), COM_Argv(1));
// insert text file into the command buffer
- COM_BufAddText((char *)buf);
- COM_BufAddText("\n");
+ COM_BufAddTextEx((char *)buf, com_flags);
+ COM_BufAddTextEx("\n", com_flags);
// free buffer
Z_Free(buf);
@@ -1002,6 +1013,9 @@ static void COM_Toggle_f(void)
return;
}
+ if (CV_Immutable(cvar))
+ return;
+
if (!(cvar->PossibleValue == CV_YesNo || cvar->PossibleValue == CV_OnOff))
{
CONS_Alert(CONS_NOTICE, M_GetText("%s is not a boolean value\n"), COM_Argv(1));
@@ -1031,6 +1045,9 @@ static void COM_Add_f(void)
return;
}
+ if (CV_Immutable(cvar))
+ return;
+
if (( cvar->flags & CV_FLOAT ))
{
float n =FIXED_TO_FLOAT (cvar->value) + atof(COM_Argv(2));
@@ -1120,7 +1137,7 @@ void VS_Write(vsbuf_t *buf, const void *data, size_t length)
M_Memcpy(VS_GetSpace(buf, length), data, length);
}
-void VS_WriteEx(vsbuf_t *buf, const void *data, size_t length, int flags)
+void VS_WriteEx(vsbuf_t *buf, const void *data, size_t length, com_flags_t flags)
{
char *p;
p = VS_GetSpace(buf, 2 + length);
@@ -2374,7 +2391,7 @@ static boolean CV_Command(void)
if (!v)
return false;
- if (( com_flags & COM_SAFE ) && ( v->flags & CV_NOLUA ))
+ if (CV_Immutable(v))
{
CONS_Alert(CONS_WARNING, "Variable '%s' cannot be changed from Lua.\n", v->name);
return true;
@@ -2463,6 +2480,22 @@ void CV_SaveVariables(FILE *f)
}
}
+// Returns true if this cvar cannot be modified in current context.
+// Such as if the cvar does not have CV_ALLOWLUA.
+static boolean CV_Immutable(const consvar_t *var)
+{
+ // Currently operating from Lua
+ if (com_flags & COM_LUA)
+ {
+ if (!(var->flags & CV_ALLOWLUA))
+ {
+ return true;
+ }
+ }
+
+ return false;
+}
+
//============================================================================
// SCRIPT PARSE
//============================================================================
diff --git a/src/command.h b/src/command.h
index c60bf33a1926c80a9751816f8db2e37d5136a0b5..69d1890d34d068ac67eb48c10e5c0ec5b8764b7f 100644
--- a/src/command.h
+++ b/src/command.h
@@ -20,23 +20,23 @@
// Command buffer & command execution
//===================================
-/* Lua command registration flags. */
-enum
+/* Command registration flags. */
+typedef enum
{
COM_ADMIN = 1,
COM_SPLITSCREEN = 2,
COM_LOCAL = 4,
-};
-/* Command buffer flags. */
-enum
-{
- COM_SAFE = 1,
-};
+ // COM_BufInsertText etc: can only access cvars
+ // with CV_ALLOWLUA set.
+ // COM_AddCommand: without this flag, the command
+ // CANNOT be run from Lua.
+ COM_LUA = 8,
+} com_flags_t;
typedef void (*com_func_t)(void);
-void COM_AddCommand(const char *name, com_func_t func);
+void COM_AddCommand(const char *name, com_func_t func, com_flags_t flags);
int COM_AddLuaCommand(const char *name);
size_t COM_Argc(void);
@@ -53,11 +53,11 @@ const char *COM_CompleteAlias(const char *partial, INT32 skips);
// insert at queu (at end of other command)
#define COM_BufAddText(s) COM_BufAddTextEx(s, 0)
-void COM_BufAddTextEx(const char *btext, int flags);
+void COM_BufAddTextEx(const char *btext, com_flags_t flags);
// insert in head (before other command)
#define COM_BufInsertText(s) COM_BufInsertTextEx(s, 0)
-void COM_BufInsertTextEx(const char *btext, int flags);
+void COM_BufInsertTextEx(const char *btext, com_flags_t flags);
// don't bother inserting, just do immediately
void COM_ImmedExecute(const char *ptext);
@@ -89,7 +89,7 @@ void VS_Free(vsbuf_t *buf);
void VS_Clear(vsbuf_t *buf);
void *VS_GetSpace(vsbuf_t *buf, size_t length);
void VS_Write(vsbuf_t *buf, const void *data, size_t length);
-void VS_WriteEx(vsbuf_t *buf, const void *data, size_t length, int flags);
+void VS_WriteEx(vsbuf_t *buf, const void *data, size_t length, com_flags_t flags);
void VS_Print(vsbuf_t *buf, const char *data); // strcats onto the sizebuf
//==================
@@ -120,7 +120,7 @@ typedef enum
// can only be set when we have the pointer to it
// used on menus
CV_CHEAT = 2048, // Don't let this be used in multiplayer unless cheats are on.
- CV_NOLUA = 4096,/* don't let this be called from Lua */
+ CV_ALLOWLUA = 4096,/* Let this be called from Lua */
} cvflags_t;
typedef struct CV_PossibleValue_s
diff --git a/src/console.c b/src/console.c
index 0a910858b55a9178bf9e6717648560c7270bfd5e..33d59046e41b85d78511998052edc6692c6aaa89 100644
--- a/src/console.c
+++ b/src/console.c
@@ -443,7 +443,7 @@ void CON_Init(void)
// register our commands
//
- COM_AddCommand("cls", CONS_Clear_f);
+ COM_AddCommand("cls", CONS_Clear_f, 0);
//COM_AddCommand("english", CONS_English_f);
// set console full screen for game startup MAKE SURE VID_Init() done !!!
Lock_state();
@@ -470,7 +470,7 @@ void CON_Init(void)
CV_RegisterVar(&cons_height);
CV_RegisterVar(&cons_backpic);
CV_RegisterVar(&cons_backcolor);
- COM_AddCommand("bind", CONS_Bind_f);
+ COM_AddCommand("bind", CONS_Bind_f, 0);
}
else
{
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index aa2b2fd6b8eb5328fe93226448340b4bf1257386..94384e46ab56f79cb13e8bbeb8fae3748f5dca30 100755
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1377,8 +1377,9 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
netbuffer->u.serverinfo.time = (tic_t)LONG(servertime);
netbuffer->u.serverinfo.leveltime = (tic_t)LONG(leveltime);
- netbuffer->u.serverinfo.numberofplayer = (UINT8)D_NumPlayers();
- netbuffer->u.serverinfo.maxplayer = (UINT8)cv_maxplayers.value;
+ // Exclude bots from both counts
+ netbuffer->u.serverinfo.numberofplayer = (UINT8)(D_NumPlayers() - D_NumBots());
+ netbuffer->u.serverinfo.maxplayer = (UINT8)(cv_maxplayers.value - D_NumBots());
netbuffer->u.serverinfo.refusereason = GetRefuseReason(node);
@@ -3506,10 +3507,10 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
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_allownewplayer = CVAR_INIT ("allowjoin", "On", 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_joinnextround = CVAR_INIT ("joinnextround", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL); /// \todo not done
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, maxplayers_cons_t, NULL);
+consvar_t cv_maxplayers = CVAR_INIT ("maxplayers", "8", 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);
static CV_PossibleValue_t rejointimeout_cons_t[] = {{1, "MIN"}, {60 * FRACUNIT, "MAX"}, {0, "Off"}, {0, NULL}};
@@ -3537,22 +3538,22 @@ void D_ClientServerInit(void)
VERSION/100, VERSION%100, SUBVERSION));
#ifndef NONET
- COM_AddCommand("getplayernum", Command_GetPlayerNum);
- COM_AddCommand("kick", Command_Kick);
- COM_AddCommand("ban", Command_Ban);
- COM_AddCommand("banip", Command_BanIP);
- COM_AddCommand("clearbans", Command_ClearBans);
- COM_AddCommand("showbanlist", Command_ShowBan);
- COM_AddCommand("reloadbans", Command_ReloadBan);
- COM_AddCommand("connect", Command_connect);
- COM_AddCommand("nodes", Command_Nodes);
- COM_AddCommand("resendgamestate", Command_ResendGamestate);
+ 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("resendgamestate", Command_ResendGamestate, COM_LUA);
#ifdef PACKETDROP
- COM_AddCommand("drop", Command_Drop);
- COM_AddCommand("droprate", Command_Droprate);
+ COM_AddCommand("drop", Command_Drop, COM_LUA);
+ COM_AddCommand("droprate", Command_Droprate, COM_LUA);
#endif
#ifdef _DEBUG
- COM_AddCommand("numnodes", Command_Numnodes);
+ COM_AddCommand("numnodes", Command_Numnodes, COM_LUA);
#endif
#endif
@@ -4077,7 +4078,7 @@ ConnectionRefused (SINT8 node, INT32 rejoinernum)
{
return va(
"Maximum players reached: %d",
- cv_maxplayers.value);
+ cv_maxplayers.value - D_NumBots());
}
}
@@ -5609,6 +5610,19 @@ INT32 D_NumPlayers(void)
return num;
}
+/** Similar to the above, but counts only bots.
+ * Purpose is to remove bots from both the player count and the
+ * max player count on the server view
+*/
+INT32 D_NumBots(void)
+{
+ INT32 num = 0, ix;
+ for (ix = 0; ix < MAXPLAYERS; ix++)
+ if (playeringame[ix] && players[ix].bot)
+ num++;
+ return num;
+}
+
tic_t GetLag(INT32 node)
{
return gametic - nettics[node];
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index 8767445d4ee366027dca934b757ee5be43e8f524..baadafb0e57898cb864a70db858c174844a2cd8f 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -447,6 +447,7 @@ extern char motd[254], server_context[8];
extern UINT8 playernode[MAXPLAYERS];
INT32 D_NumPlayers(void);
+INT32 D_NumBots(void);
void D_ResetTiccmds(void);
tic_t GetLag(INT32 node);
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 28e7727e1992b1b07936b0cf6c34cfddb69db7a6..64a61d7011b7b48ff739469fe86bffa1c6699ba0 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -203,37 +203,37 @@ 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_showinputjoy = CVAR_INIT ("showinputjoy", "Off", 0, CV_OnOff, NULL);
+consvar_t cv_showinputjoy = CVAR_INIT ("showinputjoy", "Off", 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);
#endif
static consvar_t cv_dummyconsvar = CVAR_INIT ("dummyconsvar", "Off", CV_CALL|CV_NOSHOWHELP, CV_OnOff, DummyConsvar_OnChange);
-consvar_t cv_restrictskinchange = CVAR_INIT ("restrictskinchange", "Yes", CV_SAVE|CV_NETVAR|CV_CHEAT, CV_YesNo, NULL);
-consvar_t cv_allowteamchange = CVAR_INIT ("allowteamchange", "Yes", CV_SAVE|CV_NETVAR, CV_YesNo, NULL);
+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_startinglives = CVAR_INIT ("startinglives", "3", CV_SAVE|CV_NETVAR|CV_CHEAT, startingliveslimit_cons_t, NULL);
+consvar_t cv_startinglives = CVAR_INIT ("startinglives", "3", 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, respawntime_cons_t, NULL);
+consvar_t cv_respawntime = CVAR_INIT ("respawndelay", "3", 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, competitionboxes_cons_t, NULL);
+consvar_t cv_competitionboxes = CVAR_INIT ("competitionboxes", "Mystery", 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, seenames_cons_t, 0);
-consvar_t cv_allowseenames = CVAR_INIT ("allowseenames", "Yes", CV_SAVE|CV_NETVAR, CV_YesNo, 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);
// 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);
// player colors
UINT16 lastgoodcolor = SKINCOLOR_BLUE, lastgoodcolor2 = SKINCOLOR_BLUE;
-consvar_t cv_playercolor = CVAR_INIT ("color", "Blue", CV_CALL|CV_NOINIT, Color_cons_t, Color_OnChange);
-consvar_t cv_playercolor2 = CVAR_INIT ("color2", "Orange", CV_CALL|CV_NOINIT, Color_cons_t, Color2_OnChange);
+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);
// player's skin, saved for commodity, when using a favorite skins wad..
-consvar_t cv_skin = CVAR_INIT ("skin", DEFAULTSKIN, CV_CALL|CV_NOINIT, NULL, Skin_OnChange);
-consvar_t cv_skin2 = CVAR_INIT ("skin2", DEFAULTSKIN2, CV_CALL|CV_NOINIT, NULL, Skin2_OnChange);
+consvar_t cv_skin = CVAR_INIT ("skin", DEFAULTSKIN, CV_CALL|CV_NOINIT|CV_ALLOWLUA, NULL, Skin_OnChange);
+consvar_t cv_skin2 = CVAR_INIT ("skin2", DEFAULTSKIN2, CV_CALL|CV_NOINIT|CV_ALLOWLUA, NULL, Skin2_OnChange);
// saved versions of the above six
consvar_t cv_defaultplayercolor = CVAR_INIT ("defaultcolor", "Blue", CV_SAVE, Color_cons_t, NULL);
@@ -268,43 +268,43 @@ consvar_t cv_mouse2opt = CVAR_INIT ("mouse2opt", "0", CV_SAVE, NULL, NULL);
consvar_t cv_mouse2port = CVAR_INIT ("mouse2port", "COM2", CV_SAVE, mouse2port_cons_t, NULL);
#endif
-consvar_t cv_matchboxes = CVAR_INIT ("matchboxes", "Normal", CV_SAVE|CV_NETVAR|CV_CHEAT, matchboxes_cons_t, NULL);
-consvar_t cv_specialrings = CVAR_INIT ("specialrings", "On", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
-consvar_t cv_powerstones = CVAR_INIT ("powerstones", "On", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
-
-consvar_t cv_recycler = CVAR_INIT ("tv_recycler", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_teleporters = CVAR_INIT ("tv_teleporter", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_superring = CVAR_INIT ("tv_superring", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_supersneakers = CVAR_INIT ("tv_supersneaker", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_invincibility = CVAR_INIT ("tv_invincibility", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_jumpshield = CVAR_INIT ("tv_jumpshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_watershield = CVAR_INIT ("tv_watershield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_ringshield = CVAR_INIT ("tv_ringshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_forceshield = CVAR_INIT ("tv_forceshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_bombshield = CVAR_INIT ("tv_bombshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_1up = CVAR_INIT ("tv_1up", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_eggmanbox = CVAR_INIT ("tv_eggman", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-
-consvar_t cv_ringslinger = CVAR_INIT ("ringslinger", "No", CV_NETVAR|CV_NOSHOWHELP|CV_CALL|CV_CHEAT, CV_YesNo, Ringslinger_OnChange);
-consvar_t cv_gravity = CVAR_INIT ("gravity", "0.5", CV_RESTRICT|CV_FLOAT|CV_CALL, NULL, Gravity_OnChange);
+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_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_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_soundtest = CVAR_INIT ("soundtest", "0", 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, minitimelimit_cons_t, NULL);
+consvar_t cv_countdowntime = CVAR_INIT ("countdowntime", "60", 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_OnOff, NULL);
-consvar_t cv_hidetime = CVAR_INIT ("hidetime", "30", CV_SAVE|CV_NETVAR|CV_CALL, minitimelimit_cons_t, Hidetime_OnChange);
+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_autobalance = CVAR_INIT ("autobalance", "Off", CV_SAVE|CV_NETVAR|CV_CALL, CV_OnOff, AutoBalance_OnChange);
-consvar_t cv_teamscramble = CVAR_INIT ("teamscramble", "Off", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT, teamscramble_cons_t, TeamScramble_OnChange);
-consvar_t cv_scrambleonchange = CVAR_INIT ("scrambleonchange", "Off", CV_SAVE|CV_NETVAR, teamscramble_cons_t, NULL);
+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_friendlyfire = CVAR_INIT ("friendlyfire", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
-consvar_t cv_itemfinder = CVAR_INIT ("itemfinder", "Off", CV_CALL, CV_OnOff, ItemFinder_OnChange);
+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);
// Scoring type options
-consvar_t cv_overtime = CVAR_INIT ("overtime", "Yes", CV_SAVE|CV_NETVAR, CV_YesNo, NULL);
+consvar_t cv_overtime = CVAR_INIT ("overtime", "Yes", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL);
consvar_t cv_rollingdemos = CVAR_INIT ("rollingdemos", "On", CV_SAVE, CV_OnOff, NULL);
@@ -315,13 +315,13 @@ static CV_PossibleValue_t powerupdisplay_cons_t[] = {{0, "Never"}, {1, "First-pe
consvar_t cv_powerupdisplay = CVAR_INIT ("powerupdisplay", "First-person only", 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, pointlimit_cons_t, PointLimit_OnChange);
+consvar_t cv_pointlimit = CVAR_INIT ("pointlimit", "None", 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, timelimit_cons_t, TimeLimit_OnChange);
+consvar_t cv_timelimit = CVAR_INIT ("timelimit", "None", 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, numlaps_cons_t, NumLaps_OnChange);
+consvar_t cv_numlaps = CVAR_INIT ("numlaps", "4", 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, basenumlaps_cons_t, BaseNumLaps_OnChange);
+consvar_t cv_basenumlaps = CVAR_INIT ("basenumlaps", "Map default", 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];
@@ -330,11 +330,11 @@ 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_forceskin = CVAR_INIT ("forceskin", "None", CV_NETVAR|CV_CALL|CV_CHEAT, NULL, ForceSkin_OnChange);
+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_YesNo, NULL);
+consvar_t cv_allowexitlevel = CVAR_INIT ("allowexitlevel", "No", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL);
-consvar_t cv_killingdead = CVAR_INIT ("killingdead", "Off", CV_NETVAR, CV_OnOff, NULL);
+consvar_t cv_killingdead = CVAR_INIT ("killingdead", "Off", CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
consvar_t cv_netstat = CVAR_INIT ("netstat", "Off", 0, CV_OnOff, NULL); // show bandwidth statistics
static CV_PossibleValue_t nettimeout_cons_t[] = {{TICRATE/7, "MIN"}, {60*TICRATE, "MAX"}, {0, NULL}};
@@ -352,26 +352,26 @@ consvar_t cv_showping = CVAR_INIT ("showping", "Warning", CV_SAVE, showping_cons
// 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, inttime_cons_t, NULL);
+consvar_t cv_inttime = CVAR_INIT ("inttime", "10", 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, coopstarposts_cons_t, CoopStarposts_OnChange);
+consvar_t cv_coopstarposts = CVAR_INIT ("coopstarposts", "Per-player", 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, cooplives_cons_t, CoopLives_OnChange);
+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);
static CV_PossibleValue_t advancemap_cons_t[] = {{0, "Off"}, {1, "Next"}, {2, "Random"}, {0, NULL}};
-consvar_t cv_advancemap = CVAR_INIT ("advancemap", "Next", CV_SAVE|CV_NETVAR, advancemap_cons_t, NULL);
+consvar_t cv_advancemap = CVAR_INIT ("advancemap", "Next", 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", "All", CV_SAVE|CV_NETVAR, playersforexit_cons_t, NULL);
+consvar_t cv_playersforexit = CVAR_INIT ("playersforexit", "All", 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_OnOff, ExitMove_OnChange);
+consvar_t cv_exitmove = CVAR_INIT ("exitmove", "On", CV_SAVE|CV_NETVAR|CV_CALL|CV_ALLOWLUA, CV_OnOff, ExitMove_OnChange);
-consvar_t cv_runscripts = CVAR_INIT ("runscripts", "Yes", 0, CV_YesNo, NULL);
+consvar_t cv_runscripts = CVAR_INIT ("runscripts", "Yes", CV_ALLOWLUA, CV_YesNo, NULL);
-consvar_t cv_pause = CVAR_INIT ("pausepermission", "Server", CV_SAVE|CV_NETVAR, pause_cons_t, NULL);
-consvar_t cv_mute = CVAR_INIT ("mute", "Off", CV_NETVAR|CV_CALL, CV_OnOff, Mute_OnChange);
+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_sleep = CVAR_INIT ("cpusleep", "1", CV_SAVE, sleeping_cons_t, NULL);
@@ -464,57 +464,57 @@ void D_RegisterServerCommands(void)
RegisterNetXCmd(XD_LUAFILE, Got_LuaFile);
// Remote Administration
- COM_AddCommand("password", Command_Changepassword_f);
- COM_AddCommand("login", Command_Login_f); // useful in dedicated to kick off remote admin
- COM_AddCommand("promote", Command_Verify_f);
+ COM_AddCommand("password", Command_Changepassword_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);
RegisterNetXCmd(XD_VERIFIED, Got_Verification);
- COM_AddCommand("demote", Command_RemoveAdmin_f);
+ COM_AddCommand("demote", Command_RemoveAdmin_f, COM_LUA);
RegisterNetXCmd(XD_DEMOTED, Got_Removal);
- COM_AddCommand("motd", Command_MotD_f);
+ COM_AddCommand("motd", 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_AddCommand("serverchangeteam", Command_ServerTeamChange_f, COM_LUA);
RegisterNetXCmd(XD_CLEARSCORES, Got_Clearscores);
- COM_AddCommand("clearscores", Command_Clearscores_f);
- COM_AddCommand("map", Command_Map_f);
+ COM_AddCommand("clearscores", Command_Clearscores_f, COM_LUA);
+ COM_AddCommand("map", Command_Map_f, COM_LUA);
- COM_AddCommand("exitgame", Command_ExitGame_f);
- COM_AddCommand("retry", Command_Retry_f);
- COM_AddCommand("exitlevel", Command_ExitLevel_f);
- COM_AddCommand("showmap", Command_Showmap_f);
- COM_AddCommand("mapmd5", Command_Mapmd5_f);
+ 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("addfolder", Command_Addfolder);
- COM_AddCommand("addfile", Command_Addfile);
- COM_AddCommand("listwad", Command_ListWADS_f);
+ COM_AddCommand("addfolder", Command_Addfolder, COM_LUA);
+ COM_AddCommand("addfile", Command_Addfile, COM_LUA);
+ COM_AddCommand("listwad", Command_ListWADS_f, COM_LUA);
- COM_AddCommand("runsoc", Command_RunSOC);
- COM_AddCommand("pause", Command_Pause);
- COM_AddCommand("suicide", Command_Suicide);
+ COM_AddCommand("runsoc", Command_RunSOC, COM_LUA);
+ COM_AddCommand("pause", Command_Pause, COM_LUA);
+ COM_AddCommand("suicide", Command_Suicide, COM_LUA);
- COM_AddCommand("gametype", Command_ShowGametype_f);
- COM_AddCommand("version", Command_Version_f);
+ COM_AddCommand("gametype", Command_ShowGametype_f, COM_LUA);
+ COM_AddCommand("version", Command_Version_f, COM_LUA);
#ifdef UPDATE_ALERT
- COM_AddCommand("mod_details", Command_ModDetails_f);
+ COM_AddCommand("mod_details", Command_ModDetails_f, COM_LUA);
#endif
- COM_AddCommand("quit", Command_Quit_f);
-
- COM_AddCommand("saveconfig", Command_SaveConfig_f);
- COM_AddCommand("loadconfig", Command_LoadConfig_f);
- COM_AddCommand("changeconfig", Command_ChangeConfig_f);
- COM_AddCommand("isgamemodified", Command_Isgamemodified_f); // test
- COM_AddCommand("showscores", Command_ShowScores_f);
- COM_AddCommand("showtime", Command_ShowTime_f);
- COM_AddCommand("cheats", Command_Cheats_f); // test
+ 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
#ifdef _DEBUG
- COM_AddCommand("togglemodified", Command_Togglemodified_f);
- COM_AddCommand("archivetest", Command_Archivetest_f);
+ COM_AddCommand("togglemodified", Command_Togglemodified_f, COM_LUA);
+ COM_AddCommand("archivetest", Command_Archivetest_f, COM_LUA);
#endif
- COM_AddCommand("downloads", Command_Downloads_f);
+ COM_AddCommand("downloads", Command_Downloads_f, COM_LUA);
// for master server connection
AddMServCommands();
@@ -601,7 +601,7 @@ void D_RegisterServerCommands(void)
CV_RegisterVar(&cv_blamecfail);
#endif
- COM_AddCommand("ping", Command_Ping_f);
+ COM_AddCommand("ping", Command_Ping_f, COM_LUA);
CV_RegisterVar(&cv_nettimeout);
CV_RegisterVar(&cv_jointimeout);
@@ -645,25 +645,25 @@ void D_RegisterClientCommands(void)
if (dedicated)
return;
- COM_AddCommand("numthinkers", Command_Numthinkers_f);
- COM_AddCommand("countmobjs", Command_CountMobjs_f);
+ COM_AddCommand("numthinkers", Command_Numthinkers_f, COM_LUA);
+ COM_AddCommand("countmobjs", Command_CountMobjs_f, COM_LUA);
- COM_AddCommand("changeteam", Command_Teamchange_f);
- COM_AddCommand("changeteam2", Command_Teamchange2_f);
+ COM_AddCommand("changeteam", Command_Teamchange_f, COM_LUA);
+ COM_AddCommand("changeteam2", Command_Teamchange2_f, COM_LUA);
- COM_AddCommand("playdemo", Command_Playdemo_f);
- COM_AddCommand("timedemo", Command_Timedemo_f);
- COM_AddCommand("stopdemo", Command_Stopdemo_f);
- COM_AddCommand("playintro", Command_Playintro_f);
+ 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("resetcamera", Command_ResetCamera_f);
+ COM_AddCommand("resetcamera", Command_ResetCamera_f, COM_LUA);
- COM_AddCommand("setcontrol", Command_Setcontrol_f);
- COM_AddCommand("setcontrol2", Command_Setcontrol2_f);
+ COM_AddCommand("setcontrol", Command_Setcontrol_f, 0);
+ COM_AddCommand("setcontrol2", Command_Setcontrol2_f, 0);
- COM_AddCommand("screenshot", M_ScreenShot);
- COM_AddCommand("startmovie", Command_StartMovie_f);
- COM_AddCommand("stopmovie", Command_StopMovie_f);
+ COM_AddCommand("screenshot", M_ScreenShot, COM_LUA);
+ COM_AddCommand("startmovie", Command_StartMovie_f, COM_LUA);
+ COM_AddCommand("stopmovie", Command_StopMovie_f, COM_LUA);
CV_RegisterVar(&cv_screenshot_option);
CV_RegisterVar(&cv_screenshot_folder);
@@ -725,7 +725,7 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_ghost_last);
CV_RegisterVar(&cv_ghost_guest);
- COM_AddCommand("displayplayer", Command_Displayplayer_f);
+ COM_AddCommand("displayplayer", Command_Displayplayer_f, COM_LUA);
// FIXME: not to be here.. but needs be done for config loading
CV_RegisterVar(&cv_globalgamma);
@@ -881,7 +881,7 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_ps_descriptor);
// ingame object placing
- COM_AddCommand("objectplace", Command_ObjectPlace_f);
+ COM_AddCommand("objectplace", Command_ObjectPlace_f, COM_LUA);
//COM_AddCommand("writethings", Command_Writethings_f);
CV_RegisterVar(&cv_speed);
CV_RegisterVar(&cv_opflags);
@@ -893,32 +893,32 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_freedemocamera);
// add cheat commands
- COM_AddCommand("noclip", Command_CheatNoClip_f);
- COM_AddCommand("god", Command_CheatGod_f);
- COM_AddCommand("notarget", Command_CheatNoTarget_f);
- COM_AddCommand("getallemeralds", Command_Getallemeralds_f);
- COM_AddCommand("resetemeralds", Command_Resetemeralds_f);
- COM_AddCommand("setrings", Command_Setrings_f);
- COM_AddCommand("setlives", Command_Setlives_f);
- COM_AddCommand("setcontinues", Command_Setcontinues_f);
- COM_AddCommand("devmode", Command_Devmode_f);
- COM_AddCommand("savecheckpoint", Command_Savecheckpoint_f);
- COM_AddCommand("scale", Command_Scale_f);
- COM_AddCommand("gravflip", Command_Gravflip_f);
- COM_AddCommand("hurtme", Command_Hurtme_f);
- COM_AddCommand("jumptoaxis", Command_JumpToAxis_f);
- COM_AddCommand("charability", Command_Charability_f);
- COM_AddCommand("charspeed", Command_Charspeed_f);
- COM_AddCommand("teleport", Command_Teleport_f);
- COM_AddCommand("rteleport", Command_RTeleport_f);
- COM_AddCommand("skynum", Command_Skynum_f);
- COM_AddCommand("weather", Command_Weather_f);
- COM_AddCommand("toggletwod", Command_Toggletwod_f);
+ 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);
#ifdef _DEBUG
- COM_AddCommand("causecfail", Command_CauseCfail_f);
+ COM_AddCommand("causecfail", Command_CauseCfail_f, COM_LUA);
#endif
#ifdef LUA_ALLOW_BYTECODE
- COM_AddCommand("dumplua", Command_Dumplua_f);
+ COM_AddCommand("dumplua", Command_Dumplua_f, COM_LUA);
#endif
}
diff --git a/src/deh_tables.c b/src/deh_tables.c
index 00dd7525e0703912c91830f2e26af02f817f56b9..c3b2cfccd64aae8601e045c4587d3b435036ab97 100644
--- a/src/deh_tables.c
+++ b/src/deh_tables.c
@@ -5525,7 +5525,7 @@ struct int_const_s const INT_CONST[] = {
{"CV_HIDEN",CV_HIDEN},
{"CV_HIDDEN",CV_HIDEN},
{"CV_CHEAT",CV_CHEAT},
- {"CV_NOLUA",CV_NOLUA},
+ {"CV_ALLOWLUA",CV_ALLOWLUA},
// v_video flags
{"V_NOSCALEPATCH",V_NOSCALEPATCH},
diff --git a/src/f_finale.c b/src/f_finale.c
index ea5ce62bd0d113f73d92a875358828cbbebb13f3..fe94b924c104699f3140c55ec27e408a50eeb330 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -2503,6 +2503,8 @@ void F_StartTitleScreen(void)
{
titlemapinaction = TITLEMAP_OFF;
gamemap = 1; // g_game.c
+ if (!mapheaderinfo[gamemap-1])
+ P_AllocMapHeader(gamemap-1);
CON_ClearHUD();
}
diff --git a/src/g_game.c b/src/g_game.c
index e49308c5fe31fd16d7aa69bd20c00bcff735964f..8c497a72d087dc4e3dc96bd46d377b0f1d482056 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -364,36 +364,36 @@ consvar_t cv_autobrake2 = CVAR_INIT ("autobrake2", "On", CV_SAVE|CV_CALL, CV_OnO
// 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, zerotoone_cons_t, NULL),
- CVAR_INIT ("cam2_shiftfacingchar", "0.375", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
+ 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),
};
consvar_t cv_cam_turnfacing[2] = {
- CVAR_INIT ("cam_turnfacingchar", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
- CVAR_INIT ("cam2_turnfacingchar", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
+ 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),
};
consvar_t cv_cam_turnfacingability[2] = {
- CVAR_INIT ("cam_turnfacingability", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
- CVAR_INIT ("cam2_turnfacingability", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
+ 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),
};
consvar_t cv_cam_turnfacingspindash[2] = {
- CVAR_INIT ("cam_turnfacingspindash", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
- CVAR_INIT ("cam2_turnfacingspindash", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
+ 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),
};
consvar_t cv_cam_turnfacinginput[2] = {
- CVAR_INIT ("cam_turnfacinginput", "0.375", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
- CVAR_INIT ("cam2_turnfacinginput", "0.375", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
+ 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),
};
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, centertoggle_cons_t, NULL),
- CVAR_INIT ("cam2_centertoggle", "Hold", CV_SAVE, centertoggle_cons_t, NULL),
+ 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),
};
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, lockedinput_cons_t, NULL),
- CVAR_INIT ("cam2_lockedinput", "Strafe", CV_SAVE, lockedinput_cons_t, NULL),
+ 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),
};
static CV_PossibleValue_t lockedassist_cons_t[] = {
@@ -405,8 +405,8 @@ static CV_PossibleValue_t lockedassist_cons_t[] = {
{0, NULL}
};
consvar_t cv_cam_lockonboss[2] = {
- CVAR_INIT ("cam_lockaimassist", "Full", CV_SAVE, lockedassist_cons_t, NULL),
- CVAR_INIT ("cam2_lockaimassist", "Full", CV_SAVE, lockedassist_cons_t, NULL),
+ 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),
};
consvar_t cv_moveaxis = CVAR_INIT ("joyaxis_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL);
diff --git a/src/g_input.c b/src/g_input.c
index 9d5656253dbf2be150917e4638c710b631582089..826dcecbdf22b6ff833fce6e65bfb71ef051d05d 100644
--- a/src/g_input.c
+++ b/src/g_input.c
@@ -993,7 +993,7 @@ static void setcontrol(INT32 (*gc)[2])
{
INT32 numctrl;
const char *namectrl;
- INT32 keynum, keynum1, keynum2;
+ INT32 keynum, keynum1, keynum2 = 0;
INT32 player = ((void*)gc == (void*)&gamecontrolbis ? 1 : 0);
boolean nestedoverride = false;
@@ -1009,7 +1009,8 @@ static void setcontrol(INT32 (*gc)[2])
return;
}
keynum1 = G_KeyNameToNum(COM_Argv(2));
- keynum2 = G_KeyNameToNum(COM_Argv(3));
+ if (COM_Argc() > 3)
+ keynum2 = G_KeyNameToNum(COM_Argv(3));
keynum = G_FilterKeyByVersion(numctrl, 0, player, &keynum1, &keynum2, &nestedoverride);
if (keynum >= 0)
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index c5a32dbd2b5cfcc53db975f68e271ec3c44a771f..23c63e98f57f33f844fb45d104b91522263b109f 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -328,10 +328,10 @@ void HU_LoadGraphics(void)
void HU_Init(void)
{
#ifndef NONET
- COM_AddCommand("say", Command_Say_f);
- COM_AddCommand("sayto", Command_Sayto_f);
- COM_AddCommand("sayteam", Command_Sayteam_f);
- COM_AddCommand("csay", Command_CSay_f);
+ 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);
RegisterNetXCmd(XD_SAY, Got_Saycmd);
#endif
diff --git a/src/i_time.c b/src/i_time.c
index 55d1557bd9b603107d33048c5cb156b6451f35e0..2a22503f1b8b5c70a8145d2c45696aa2c50f0922 100644
--- a/src/i_time.c
+++ b/src/i_time.c
@@ -43,18 +43,20 @@ tic_t I_GetTime(void)
void I_InitializeTime(void)
{
- g_time.time = 0;
- g_time.timefrac = 0;
-
- enterprecise = 0;
- oldenterprecise = 0;
- tictimer = 0.0;
-
CV_RegisterVar(&cv_timescale);
// I_StartupTimer is preserved for potential subsystems that need to setup
// timing information for I_GetPreciseTime and sleeping
I_StartupTimer();
+
+ g_time.time = 0;
+ g_time.timefrac = 0;
+
+ enterprecise = I_GetPreciseTime();
+ oldenterprecise = enterprecise;
+ entertic = 0;
+ oldentertics = 0;
+ tictimer = 0.0;
}
void I_UpdateTime(fixed_t timescale)
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index 8fec7bd63c3fbfd0124769584625a50bcce0dfa7..6e258c82a97427dd976933a42f5772e45a4a3004 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -3541,7 +3541,6 @@ static int lib_gAddPlayer(lua_State *L)
return 1;
}
-
newplayernum = i;
CL_ClearPlayer(newplayernum);
@@ -3553,9 +3552,6 @@ static int lib_gAddPlayer(lua_State *L)
newplayer->jointime = 0;
newplayer->quittime = 0;
- // Set the bot name (defaults to Bot #)
- strcpy(player_names[newplayernum], va("Bot %d", botcount));
-
// Read the skin argument (defaults to Sonic)
if (!lua_isnoneornil(L, 1))
{
@@ -3567,7 +3563,10 @@ static int lib_gAddPlayer(lua_State *L)
if (!lua_isnoneornil(L, 2))
newplayer->skincolor = R_GetColorByName(luaL_checkstring(L, 2));
else
- newplayer->skincolor = skins[newplayer->skin].prefcolor;
+ newplayer->skincolor = skins[skinnum].prefcolor;
+
+ // Set the bot default name as the skin
+ strcpy(player_names[newplayernum], skins[skinnum].realname);
// Read the bot name, if given
if (!lua_isnoneornil(L, 3))
@@ -3583,14 +3582,19 @@ static int lib_gAddPlayer(lua_State *L)
// Set the skin (can't do this until AFTER bot type is set!)
SetPlayerSkinByNum(newplayernum, skinnum);
-
if (netgame)
{
char joinmsg[256];
+ // Truncate bot name
+ player_names[newplayernum][sizeof(*player_names) - 7] = '\0'; // The length of colored [BOT] + 1
+
strcpy(joinmsg, M_GetText("\x82*Bot %s has joined the game (player %d)"));
strcpy(joinmsg, va(joinmsg, player_names[newplayernum], newplayernum));
HU_AddChatText(joinmsg, false);
+
+ // Append blue [BOT] tag at the end
+ strlcat(player_names[newplayernum], "\x84[BOT]", sizeof(*player_names));
}
LUA_PushUserdata(L, newplayer, META_PLAYER);
diff --git a/src/lua_consolelib.c b/src/lua_consolelib.c
index da4094732557a2b6aa716df4245e85922f3a16b9..dcaad1416011941230285723037a193ade75102e 100644
--- a/src/lua_consolelib.c
+++ b/src/lua_consolelib.c
@@ -253,7 +253,7 @@ static int lib_comBufAddText(lua_State *L)
plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
if (plr && plr != &players[consoleplayer])
return 0;
- COM_BufAddTextEx(va("%s\n", luaL_checkstring(L, 2)), COM_SAFE);
+ COM_BufAddTextEx(va("%s\n", luaL_checkstring(L, 2)), COM_LUA);
return 0;
}
@@ -269,7 +269,7 @@ static int lib_comBufInsertText(lua_State *L)
plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
if (plr && plr != &players[consoleplayer])
return 0;
- COM_BufInsertTextEx(va("%s\n", luaL_checkstring(L, 2)), COM_SAFE);
+ COM_BufInsertTextEx(va("%s\n", luaL_checkstring(L, 2)), COM_LUA);
return 0;
}
@@ -450,6 +450,7 @@ static int lib_cvRegisterVar(lua_State *L)
return luaL_error(L, M_GetText("Variable %s has CV_CALL without a function"), cvar->name);
}
+ cvar->flags |= CV_ALLOWLUA;
// actually time to register it to the console now! Finally!
cvar->flags |= CV_MODIFIED;
CV_RegisterVar(cvar);
@@ -478,7 +479,7 @@ static int CVarSetFunction
){
consvar_t *cvar = *(consvar_t **)luaL_checkudata(L, 1, META_CVAR);
- if (cvar->flags & CV_NOLUA)
+ if (!(cvar->flags & CV_ALLOWLUA))
return luaL_error(L, "Variable '%s' cannot be set from Lua.", cvar->name);
switch (lua_type(L, 2))
@@ -510,7 +511,7 @@ static int lib_cvAddValue(lua_State *L)
{
consvar_t *cvar = *(consvar_t **)luaL_checkudata(L, 1, META_CVAR);
- if (cvar->flags & CV_NOLUA)
+ if (!(cvar->flags & CV_ALLOWLUA))
return luaL_error(L, "Variable %s cannot be set from Lua.", cvar->name);
CV_AddValue(cvar, (INT32)luaL_checknumber(L, 2));
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index 7abe820a578e112e1c5489377be2590c8943e510..898651520d77ead06f05ccbe767fe618708e4c20 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -1910,10 +1910,10 @@ static INT32 P_GetOldFOFFlags(ffloor_t *fflr)
result |= FF_OLD_SPINBUST;
if (fflr->busttype == BT_STRONG)
result |= FF_OLD_STRONGBUST;
- if (fflr->fofflags & FF_OLD_RIPPLE)
- result |= FOF_RIPPLE;
- if (fflr->fofflags & FF_OLD_COLORMAPONLY)
- result |= FOF_COLORMAPONLY;
+ if (fflr->fofflags & FOF_RIPPLE)
+ result |= FF_OLD_RIPPLE;
+ if (fflr->fofflags & FOF_COLORMAPONLY)
+ result |= FF_OLD_COLORMAPONLY;
return result;
}
diff --git a/src/m_cheat.c b/src/m_cheat.c
index 1056ecb02d4581986e7ecd852070d2a7ddef6725..4ea8d13b41e83cba6f2af90bb75900a95a4cf59d 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -1004,7 +1004,7 @@ static void OP_CycleThings(INT32 amt)
} while
(mobjinfo[op_currentthing].doomednum == -1
|| op_currentthing == MT_NIGHTSDRONE
- || mobjinfo[op_currentthing].flags & MF_NOSECTOR
+ || mobjinfo[op_currentthing].flags & (MF_AMBIENT|MF_NOSECTOR)
|| (states[mobjinfo[op_currentthing].spawnstate].sprite == SPR_NULL
&& states[mobjinfo[op_currentthing].seestate].sprite == SPR_NULL)
);
diff --git a/src/m_menu.c b/src/m_menu.c
index 4451af4fd4324d17287de028b63a1d340d4264f1..e879e9c14ddae6f73087cc01045b22b098d625c8 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -3909,7 +3909,7 @@ void M_Init(void)
{
int i;
- COM_AddCommand("manual", Command_Manual_f);
+ COM_AddCommand("manual", Command_Manual_f, COM_LUA);
CV_RegisterVar(&cv_nextmap);
CV_RegisterVar(&cv_newgametype);
diff --git a/src/mserv.c b/src/mserv.c
index dc0cc136a985be9b9dc459893bd56336f005a7ca..62cda96e45baf7b8e2e785ef5ee6f51437272610 100644
--- a/src/mserv.c
+++ b/src/mserv.c
@@ -62,7 +62,7 @@ static CV_PossibleValue_t masterserver_update_rate_cons_t[] = {
};
consvar_t cv_masterserver = CVAR_INIT ("masterserver", "https://mb.srb2.org/MS/0", CV_SAVE|CV_CALL, NULL, MasterServer_OnChange);
-consvar_t cv_servername = CVAR_INIT ("servername", "SRB2 server", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT, NULL, Update_parameters);
+consvar_t cv_servername = CVAR_INIT ("servername", "SRB2 server", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, NULL, Update_parameters);
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);
@@ -97,8 +97,8 @@ void AddMServCommands(void)
CV_RegisterVar(&cv_masterserver_token);
CV_RegisterVar(&cv_servername);
#ifdef MASTERSERVER
- COM_AddCommand("listserv", Command_Listserv_f);
- COM_AddCommand("masterserver_update", Update_parameters); // allows people to updates manually in case you were delisted by accident
+ 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
#endif
#endif
}
diff --git a/src/p_mobj.c b/src/p_mobj.c
index c8adb6f1d69e0cd0e2f51fbba463703613813482..9e7110de3f79ab15dc4866f531a216380c3b0549 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -5665,21 +5665,25 @@ static void P_Boss9Thinker(mobj_t *mobj)
missile->fuse = 1;
if (missile->fuse > mobj->fuse)
- P_RemoveMobj(missile);
-
- if (mobj->health > mobj->info->damage)
{
- P_SetScale(missile, FRACUNIT/3);
- missile->color = SKINCOLOR_MAGENTA; // sonic OVA/4 purple power
+ P_RemoveMobj(missile);
}
else
{
- P_SetScale(missile, FRACUNIT/5);
- missile->color = SKINCOLOR_SUNSET; // sonic cd electric power
+ if (mobj->health > mobj->info->damage)
+ {
+ P_SetScale(missile, FRACUNIT/3);
+ missile->color = SKINCOLOR_MAGENTA; // sonic OVA/4 purple power
+ }
+ else
+ {
+ P_SetScale(missile, FRACUNIT/5);
+ missile->color = SKINCOLOR_SUNSET; // sonic cd electric power
+ }
+ missile->destscale = missile->scale*2;
+ missile->scalespeed = abs(missile->scale - missile->destscale)/missile->fuse;
+ missile->colorized = true;
}
- missile->destscale = missile->scale*2;
- missile->scalespeed = abs(missile->scale - missile->destscale)/missile->fuse;
- missile->colorized = true;
}
// ...then down. easier than changing the missile's momz after-the-fact
@@ -10061,6 +10065,8 @@ static boolean P_FuseThink(mobj_t *mobj)
case MT_SPIKE:
case MT_WALLSPIKE:
P_SetMobjState(mobj, mobj->state->nextstate);
+ if (P_MobjWasRemoved(mobj))
+ return false;
mobj->fuse = mobj->spawnpoint ? mobj->spawnpoint->args[0] : mobj->info->speed;
break;
case MT_NIGHTSCORE:
@@ -10222,7 +10228,7 @@ void P_MobjThinker(mobj_t *mobj)
if (mobj->flags2 & MF2_FIRING)
P_FiringThink(mobj);
- if (mobj->type == MT_AMBIENT)
+ if (mobj->flags & MF_AMBIENT)
{
if (leveltime % mobj->health)
return;
@@ -11228,10 +11234,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, respawnitemtime_cons_t, NULL);
-consvar_t cv_itemrespawn = CVAR_INIT ("respawnitem", "On", CV_SAVE|CV_NETVAR, CV_OnOff, 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);
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, flagtime_cons_t, NULL);
+consvar_t cv_flagtime = CVAR_INIT ("flagtime", "30", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, flagtime_cons_t, NULL);
void P_SpawnPrecipitation(void)
{
@@ -13272,6 +13278,12 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
mobj->flags2 |= MF2_STRONGBOX;
}
}
+ // Custom ambient sounds
+ if ((mobj->flags & MF_AMBIENT) && mobj->type != MT_AMBIENT)
+ {
+ mobj->threshold = mobj->info->seesound;
+ mobj->health = mobj->info->spawnhealth;
+ }
return true;
}
diff --git a/src/p_mobj.h b/src/p_mobj.h
index 2cf177d2310cfa015f10ee1b6bab3ec97ac3a10e..a839eaba6784a4b325e9df0889ba88a87a712639 100644
--- a/src/p_mobj.h
+++ b/src/p_mobj.h
@@ -118,7 +118,7 @@ typedef enum
// Don't apply gravity (every tic); object will float, keeping current height
// or changing it actively.
MF_NOGRAVITY = 1<<9,
- // This object is an ambient sound. Obsolete, but keep this around for backwards compatibility.
+ // This object is an ambient sound.
MF_AMBIENT = 1<<10,
// Slide this object when it hits a wall.
MF_SLIDEME = 1<<11,
diff --git a/src/p_setup.c b/src/p_setup.c
index ecec06b37b185e90dd44cc9a8374c41fbd90998f..0759c4b801ff20ea5ea1b0a9a92d9a7c0383cbbd 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -5299,6 +5299,7 @@ static void P_ConvertBinaryLinedefTypes(void)
case 433: //Enable/disable gravity flip
lines[i].args[0] = !!(lines[i].flags & ML_NOCLIMB);
lines[i].args[1] = !!(lines[i].flags & ML_SKEWTD);
+ lines[i].args[2] = !!(lines[i].flags & ML_BLOCKMONSTERS);
break;
case 434: //Award power-up
if (sides[lines[i].sidenum[0]].text)
diff --git a/src/p_spec.c b/src/p_spec.c
index 5a262e87aa0961f84de1f2ca4843d694684a57cb..4a91b8b8e84d4b15bd25bc75f9f0d56879cef9a8 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -2786,6 +2786,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
mo->flags2 &= ~MF2_OBJECTFLIP;
else
mo->flags2 |= MF2_OBJECTFLIP;
+ if (line->args[2])
+ mo->eflags |= MFE_VERTICALFLIP;
if (bot)
bot->flags2 = (bot->flags2 & ~MF2_OBJECTFLIP) | (mo->flags2 & MF2_OBJECTFLIP);
break;
diff --git a/src/p_user.c b/src/p_user.c
index d5fb173648b3b745a91c9dd793b658a997339dbc..d441a7e81d8bdee512d62dc1cbdff4abc9e7e188 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -9647,45 +9647,45 @@ static CV_PossibleValue_t rotation_cons_t[] = {{1, "MIN"}, {25, "MAX"}, {0, NULL
static CV_PossibleValue_t CV_CamRotate[] = {{-720, "MIN"}, {720, "MAX"}, {0, NULL}};
static CV_PossibleValue_t multiplier_cons_t[] = {{0, "MIN"}, {3*FRACUNIT, "MAX"}, {0, NULL}};
-consvar_t cv_cam_dist = CVAR_INIT ("cam_curdist", "160", CV_FLOAT, NULL, NULL);
-consvar_t cv_cam_height = CVAR_INIT ("cam_curheight", "25", CV_FLOAT, NULL, NULL);
-consvar_t cv_cam_still = CVAR_INIT ("cam_still", "Off", 0, CV_OnOff, NULL);
-consvar_t cv_cam_speed = CVAR_INIT ("cam_speed", "0.3", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL);
-consvar_t cv_cam_rotate = CVAR_INIT ("cam_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate_OnChange);
-consvar_t cv_cam_rotspeed = CVAR_INIT ("cam_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL);
-consvar_t cv_cam_turnmultiplier = CVAR_INIT ("cam_turnmultiplier", "0.75", CV_FLOAT|CV_SAVE, multiplier_cons_t, NULL);
-consvar_t cv_cam_orbit = CVAR_INIT ("cam_orbit", "Off", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_cam_adjust = CVAR_INIT ("cam_adjust", "On", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_cam2_dist = CVAR_INIT ("cam2_curdist", "160", CV_FLOAT, NULL, NULL);
-consvar_t cv_cam2_height = CVAR_INIT ("cam2_curheight", "25", CV_FLOAT, NULL, NULL);
-consvar_t cv_cam2_still = CVAR_INIT ("cam2_still", "Off", 0, CV_OnOff, NULL);
-consvar_t cv_cam2_speed = CVAR_INIT ("cam2_speed", "0.3", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL);
-consvar_t cv_cam2_rotate = CVAR_INIT ("cam2_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate2_OnChange);
-consvar_t cv_cam2_rotspeed = CVAR_INIT ("cam2_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL);
-consvar_t cv_cam2_turnmultiplier = CVAR_INIT ("cam2_turnmultiplier", "0.75", CV_FLOAT|CV_SAVE, multiplier_cons_t, NULL);
-consvar_t cv_cam2_orbit = CVAR_INIT ("cam2_orbit", "Off", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_cam2_adjust = CVAR_INIT ("cam2_adjust", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_cam_dist = CVAR_INIT ("cam_curdist", "160", CV_FLOAT|CV_ALLOWLUA, NULL, NULL);
+consvar_t cv_cam_height = CVAR_INIT ("cam_curheight", "25", CV_FLOAT|CV_ALLOWLUA, NULL, 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.3", 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, NULL, NULL);
+consvar_t cv_cam2_height = CVAR_INIT ("cam2_curheight", "25", CV_FLOAT|CV_ALLOWLUA, NULL, 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.3", 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);
// [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, NULL, CV_UpdateCamDist),
- CVAR_INIT ("cam2_dist", "192", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
+ CVAR_INIT ("cam_dist", "192", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, NULL, CV_UpdateCamDist),
+ CVAR_INIT ("cam2_dist", "192", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, NULL, CV_UpdateCam2Dist),
},
{ // simple
- CVAR_INIT ("cam_simpledist", "256", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
- CVAR_INIT ("cam2_simpledist", "256", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
+ CVAR_INIT ("cam_simpledist", "256", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, NULL, CV_UpdateCamDist),
+ CVAR_INIT ("cam2_simpledist", "256", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, NULL, CV_UpdateCam2Dist),
}
};
consvar_t cv_cam_saveheight[2][2] = {
{ // standard
- CVAR_INIT ("cam_height", "40", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
- CVAR_INIT ("cam2_height", "40", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
+ CVAR_INIT ("cam_height", "40", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, NULL, CV_UpdateCamDist),
+ CVAR_INIT ("cam2_height", "40", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, NULL, CV_UpdateCam2Dist),
},
{ // simple
- CVAR_INIT ("cam_simpleheight", "60", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
- CVAR_INIT ("cam2_simpleheight", "60", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
+ CVAR_INIT ("cam_simpleheight", "60", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, NULL, CV_UpdateCamDist),
+ CVAR_INIT ("cam2_simpleheight", "60", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, NULL, CV_UpdateCam2Dist),
}
};
@@ -12808,7 +12808,7 @@ void P_PlayerAfterThink(player_t *player)
P_KillMobj(ptera, player->mo, player->mo, 0);
P_SetObjectMomZ(player->mo, 12*FRACUNIT, false);
player->pflags |= PF_APPLYAUTOBRAKE|PF_JUMPED|PF_THOKKED;
- P_SetMobjState(player->mo, S_PLAY_ROLL);
+ P_SetPlayerMobjState(player->mo, S_PLAY_ROLL);
break;
}
diff --git a/src/r_main.c b/src/r_main.c
index 53f6ee2f982ef508ea3144e1627a62e07f219eb7..2a31227d1d0368721376dae79afbcffa7e13c9c2 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -150,7 +150,7 @@ static void FlipCam2_OnChange(void);
void SendWeaponPref(void);
void SendWeaponPref2(void);
-consvar_t cv_tailspickup = CVAR_INIT ("tailspickup", "On", CV_NETVAR, CV_OnOff, NULL);
+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);
@@ -159,8 +159,8 @@ consvar_t cv_flipcam2 = CVAR_INIT ("flipcam2", "No", CV_SAVE|CV_CALL|CV_NOINIT,
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_ffloorclip = CVAR_INIT ("ffloorclip", "On", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_allowmlook = CVAR_INIT ("allowmlook", "Yes", CV_NETVAR, CV_YesNo, NULL);
-consvar_t cv_showhud = CVAR_INIT ("showhud", "Yes", CV_CALL, CV_YesNo, R_SetViewSize);
+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);
diff --git a/src/r_skins.c b/src/r_skins.c
index 56e322e87e6d024f569c7f0760da885f08218fa0..b10a78c182c8c1429e318a1ad2b0ce5e099f5b86 100644
--- a/src/r_skins.c
+++ b/src/r_skins.c
@@ -225,7 +225,7 @@ boolean R_SkinUsable(INT32 playernum, INT32 skinnum)
return true;
}
- if (Playing() && (R_SkinAvailable(mapheaderinfo[gamemap-1]->forcecharacter) == skinnum))
+ if (Playing() && mapheaderinfo[gamemap-1] && (R_SkinAvailable(mapheaderinfo[gamemap-1]->forcecharacter) == skinnum))
{
// Force 1.
return true;
diff --git a/src/s_sound.c b/src/s_sound.c
index 3bbbad479f32bc697c83e9f72a518bcf2825db57..111b6ce256661d9f0adac594dd03f4d63573afd7 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -289,8 +289,8 @@ void S_RegisterSoundStuff(void)
CV_RegisterVar(&cv_miditimiditypath);
#endif
- COM_AddCommand("tunes", Command_Tunes_f);
- COM_AddCommand("restartaudio", Command_RestartAudio_f);
+ COM_AddCommand("tunes", Command_Tunes_f, COM_LUA);
+ COM_AddCommand("restartaudio", Command_RestartAudio_f, COM_LUA);
}
static void SetChannelsNum(void)
diff --git a/src/screen.c b/src/screen.c
index ab04f68bfb861a369e2f1d02a3d32aff0ba29fc5..f8af4c504a74d2d6b779bd6befdee2ab2277c544 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -82,7 +82,7 @@ CV_PossibleValue_t cv_renderer_t[] = {
{0, NULL}
};
-consvar_t cv_renderer = CVAR_INIT ("renderer", "Software", CV_SAVE|CV_NOLUA|CV_CALL, cv_renderer_t, SCR_ChangeRenderer);
+consvar_t cv_renderer = CVAR_INIT ("renderer", "Software", CV_SAVE|CV_CALL, cv_renderer_t, SCR_ChangeRenderer);
static void SCR_ChangeFullscreen(void);
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index 5ebd276ef5967ecc11a5cb9d85fd7b0276ddc3a1..d2fbb90063f13f5ed663ee7a2665b95f8aac296e 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -1784,10 +1784,10 @@ void I_StartupGraphics(void)
if (graphics_started)
return;
- COM_AddCommand ("vid_nummodes", VID_Command_NumModes_f);
- COM_AddCommand ("vid_info", VID_Command_Info_f);
- COM_AddCommand ("vid_modelist", VID_Command_ModeList_f);
- COM_AddCommand ("vid_mode", VID_Command_Mode_f);
+ 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);
CV_RegisterVar (&cv_vidwait);
CV_RegisterVar (&cv_stretch);
CV_RegisterVar (&cv_alwaysgrabmouse);
diff --git a/src/z_zone.c b/src/z_zone.c
index ec2b70815609db665eb506bb2077b7bb3b0171e5..c012816ffd38df0b37a8dacecaca76f9216add52 100644
--- a/src/z_zone.c
+++ b/src/z_zone.c
@@ -116,10 +116,10 @@ void Z_Init(void)
CONS_Printf("System memory: %uMB - Free: %uMB\n", total>>20, memfree);
// Note: This allocates memory. Watch out.
- COM_AddCommand("memfree", Command_Memfree_f);
+ COM_AddCommand("memfree", Command_Memfree_f, COM_LUA);
#ifdef ZDEBUG
- COM_AddCommand("memdump", Command_Memdump_f);
+ COM_AddCommand("memdump", Command_Memdump_f, COM_LUA);
#endif
}