thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace TC macros with an enum that automatically counts up

Browse source 
Also fixes TC_DASHMODE not being accessible to Lua.
This commit is contained in:
James R 2020-11-28 02:19:52 -08:00
parent d6ed2f4ac8
commit 7367acf00d
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lua_hudlib.c
View file

@ -896,8 +896,10 @@ static int libd_getColormap(lua_State *L)
else if (lua_type(L, 1) == LUA_TNUMBER) // skin number else if (lua_type(L, 1) == LUA_TNUMBER) // skin number
{ {
skinnum = (INT32)luaL_checkinteger(L, 1); skinnum = (INT32)luaL_checkinteger(L, 1);
if (skinnum < TC_BLINK || skinnum >= MAXSKINS) if (skinnum >= MAXSKINS)
return luaL_error(L, "skin number %d is out of range (%d - %d)", skinnum, TC_BLINK, MAXSKINS-1); 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 else // skin name
{ {

18
src/r_draw.h
View file

@ -106,13 +106,17 @@ extern lumpnum_t viewborderlump[8];
#define GTC_CACHE 1 #define GTC_CACHE 1
#define TC_DEFAULT -1 enum
#define TC_BOSS -2 {
#define TC_METALSONIC -3 // For Metal Sonic battle TC_BOSS = INT8_MIN,
#define TC_ALLWHITE -4 // For Cy-Brak-demon TC_METALSONIC, // For Metal Sonic battle
#define TC_RAINBOW -5 // For single colour TC_ALLWHITE, // For Cy-Brak-demon
#define TC_BLINK -6 // For item blinking, according to kart TC_RAINBOW, // For single colour
#define TC_DASHMODE -7 // For Metal Sonic's dashmode TC_BLINK, // For item blinking, according to kart
TC_DASHMODE, // For Metal Sonic's dashmode
TC_DEFAULT
};
// Custom player skin translation // Custom player skin translation
// Initialize color translation tables, for player rendering etc. // Initialize color translation tables, for player rendering etc.