From bb97e0805e2c6504bf3d28a2a96f5ebf9484d807 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sun, 29 Dec 2019 20:59:48 -0800
Subject: [PATCH] Fuck magic numbers; COM_ flags for Lua commands!

---
 src/command.h        |  7 +++++++
 src/dehacked.c       |  4 ++++
 src/lua_consolelib.c | 15 +++++++++++----
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/command.h b/src/command.h
index 0880065b..3a4260ec 100644
--- a/src/command.h
+++ b/src/command.h
@@ -20,6 +20,13 @@
 // Command buffer & command execution
 //===================================
 
+/* Lua command registration flags. */
+enum
+{
+	COM_ADMIN       = 1,
+	COM_SPLITSCREEN = 2,
+};
+
 typedef void (*com_func_t)(void);
 
 void COM_AddCommand(const char *name, com_func_t func);
diff --git a/src/dehacked.c b/src/dehacked.c
index 00f4fa96..ccda7162 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -8685,6 +8685,10 @@ struct {
 	{"BT_CUSTOM2",BT_CUSTOM2}, // Lua customizable
 	{"BT_CUSTOM3",BT_CUSTOM3}, // Lua customizable
 
+	// Lua command registration flags
+	{"COM_ADMIN",COM_ADMIN},
+	{"COM_SPLITSCREEN",COM_SPLITSCREEN},
+
 	// cvflags_t
 	{"CV_SAVE",CV_SAVE},
 	{"CV_CALL",CV_CALL},
diff --git a/src/lua_consolelib.c b/src/lua_consolelib.c
index 0c73459c..081a5fab 100644
--- a/src/lua_consolelib.c
+++ b/src/lua_consolelib.c
@@ -113,12 +113,12 @@ void COM_Lua_f(void)
 
 	lua_rawgeti(gL, -1, 2); // push flags from command info table
 	if (lua_isboolean(gL, -1))
-		flags = (lua_toboolean(gL, -1) ? 1 : 0);
+		flags = (lua_toboolean(gL, -1) ? COM_ADMIN : 0);
 	else
 		flags = (UINT8)lua_tointeger(gL, -1);
 	lua_pop(gL, 1); // pop flags
 
-	if (flags & 2) // flag 2: splitscreen player command. TODO: support 4P
+	if (flags & COM_SPLITSCREEN) // flag 2: splitscreen player command. TODO: support 4P
 	{
 		if (!splitscreen)
 		{
@@ -133,7 +133,7 @@ void COM_Lua_f(void)
 		UINT8 argc;
 		lua_pop(gL, 1); // pop command info table
 
-		if (flags & 1 && !server && !IsPlayerAdmin(playernum)) // flag 1: only server/admin can use this command.
+		if (flags & COM_ADMIN && !server && !IsPlayerAdmin(playernum)) // flag 1: only server/admin can use this command.
 		{
 			CONS_Printf(M_GetText("Only the server or a remote admin can use this.\n"));
 			return;
@@ -187,7 +187,14 @@ static int lib_comAddCommand(lua_State *L)
 	if (lua_gettop(L) >= 3)
 	{ // For the third argument, only take a boolean or a number.
 		lua_settop(L, 3);
-		if (lua_type(L, 3) != LUA_TBOOLEAN)
+		if (lua_type(L, 3) == LUA_TBOOLEAN)
+		{
+			CONS_Alert(CONS_WARNING,
+					"Using a boolean is deprecated and will be removed.\n"
+					"Use \"COM_\" flags instead.\n"
+			);
+		}
+		else
 			luaL_checktype(L, 3, LUA_TNUMBER);
 	}
 	else