From b9f6069cd07b14d15b2bd26da2f49db3ae96e608 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 28 Nov 2020 02:19:52 -0800
Subject: [PATCH] Replace TC macros with an enum that automatically counts up
Also fixes TC_DASHMODE not being accessible to Lua.
---
src/lua_hudlib.c | 6 ++++--
src/r_draw.h | 18 +++++++++++-------
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c
index f4e5d5ccf..04fbf41a0 100644
--- a/src/lua_hudlib.c
+++ b/src/lua_hudlib.c
@@ -896,8 +896,10 @@ static int libd_getColormap(lua_State *L)
else if (lua_type(L, 1) == LUA_TNUMBER) // skin number
{
skinnum = (INT32)luaL_checkinteger(L, 1);
- if (skinnum < TC_BLINK || skinnum >= MAXSKINS)
- return luaL_error(L, "skin number %d is out of range (%d - %d)", skinnum, TC_BLINK, MAXSKINS-1);
+ if (skinnum >= MAXSKINS)
+ return luaL_error(L, "skin number %d is out of range (>%d)", skinnum, MAXSKINS-1);
+ else if (skinnum < 0 && skinnum > TC_DEFAULT)
+ return luaL_error(L, "translation colormap index is out of range");
}
else // skin name
{
diff --git a/src/r_draw.h b/src/r_draw.h
index 9957541ca..d1eb83033 100644
--- a/src/r_draw.h
+++ b/src/r_draw.h
@@ -106,13 +106,17 @@ extern lumpnum_t viewborderlump[8];
#define GTC_CACHE 1
-#define TC_DEFAULT -1
-#define TC_BOSS -2
-#define TC_METALSONIC -3 // For Metal Sonic battle
-#define TC_ALLWHITE -4 // For Cy-Brak-demon
-#define TC_RAINBOW -5 // For single colour
-#define TC_BLINK -6 // For item blinking, according to kart
-#define TC_DASHMODE -7 // For Metal Sonic's dashmode
+enum
+{
+ TC_BOSS = INT8_MIN,
+ TC_METALSONIC, // For Metal Sonic battle
+ TC_ALLWHITE, // For Cy-Brak-demon
+ TC_RAINBOW, // For single colour
+ TC_BLINK, // For item blinking, according to kart
+ TC_DASHMODE, // For Metal Sonic's dashmode
+
+ TC_DEFAULT
+};
// Custom player skin translation
// Initialize color translation tables, for player rendering etc.
--
GitLab