incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the Lua Linedef Flags conundrum

Browse source
This commit is contained in:
GenericHeroGuy 2025-03-17 23:00:56 +01:00
parent 197be8cb00
commit 6a43aac0d5
4 changed files with 26 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/deh_lua.c
View file

@ -362,37 +362,12 @@ static int ScanConstants(lua_State *L, boolean mathlib, const char *word)
} }
else if (fastncmp("ML_", word, 3)) { else if (fastncmp("ML_", word, 3)) {
p = word+3; p = word+3;
for (i = 0; i < 20; i++) const char *const *list = lua_compatmode ? ML_LIST_KART : ML_LIST;
if (ML_LIST[i] && fastcmp(p, ML_LIST[i])) { for (i = 0; list[i]; i++)
if (fastcmp(p, list[i])) {
CacheAndPushConstant(L, word, ((lua_Integer)1<<i)); CacheAndPushConstant(L, word, ((lua_Integer)1<<i));
return 1; return 1;
} }
// Aliases
if (fastcmp(p, "EFFECT1"))
{
lua_pushinteger(L, (lua_Integer)ML_SKEWTD);
return 1;
}
if (fastcmp(p, "EFFECT2"))
{
lua_pushinteger(L, (lua_Integer)ML_NOSKEW);
return 1;
}
if (fastcmp(p, "EFFECT3"))
{
lua_pushinteger(L, (lua_Integer)ML_MIDPEG);
return 1;
}
if (fastcmp(p, "EFFECT4"))
{
lua_pushinteger(L, (lua_Integer)ML_MIDSOLID);
return 1;
}
if (fastcmp(p, "EFFECT5"))
{
lua_pushinteger(L, (lua_Integer)ML_WRAPMIDTEX);
return 1;
}
if (mathlib) return luaL_error(L, "linedef flag '%s' could not be found.\n", word); if (mathlib) return luaL_error(L, "linedef flag '%s' could not be found.\n", word);
return 0; return 0;
} }

27
src/deh_tables.c
View file

@ -336,14 +336,31 @@ const char *const ML_LIST[] = {
"MIDPEG", "MIDPEG",
"MIDSOLID", "MIDSOLID",
"WRAPMIDTEX", "WRAPMIDTEX",
"NETONLY",
"NONET",
"EFFECT6",
"NOTBOUNCY",
"TFERLINE",
NULL
};
// Linedef flags for Kart
const char *const ML_LIST_KART[] = {
"IMPASSIBLE",
"BLOCKMONSTERS",
"TWOSIDED",
"DONTPEGTOP",
"DONTPEGBOTTOM",
"EFFECT1",
"NOCLIMB",
"EFFECT2",
"EFFECT3",
"EFFECT4",
"EFFECT5",
"NOSONIC", "NOSONIC",
"NOTAILS", "NOTAILS",
"NOKNUX", "NOKNUX",
"NETONLY", "BOUNCY",
"NETONLY_OLD",
"NONET",
"BLOCKMONSTERS",
"NOTBOUNCY",
"TFERLINE", "TFERLINE",
NULL NULL
}; };

1
src/deh_tables.h
View file

@ -70,6 +70,7 @@ extern const char *const PLAYERFLAG_LIST[];
extern const char *const ITEMFLAG_LIST[]; extern const char *const ITEMFLAG_LIST[];
extern const char *const GAMETYPERULE_LIST[]; extern const char *const GAMETYPERULE_LIST[];
extern const char *const ML_LIST[]; // Linedef flags extern const char *const ML_LIST[]; // Linedef flags
extern const char *const ML_LIST_KART[]; // Linedef flags for Kart
extern const char *const MSF_LIST[]; // Sector flags extern const char *const MSF_LIST[]; // Sector flags
extern const char *const SSF_LIST[]; // Sector special flags extern const char *const SSF_LIST[]; // Sector special flags
extern const char *const SD_LIST[]; // Sector damagetype extern const char *const SD_LIST[]; // Sector damagetype

5
src/doomdata.h
View file

@ -144,11 +144,6 @@ enum
ML_MIDSOLID = 0x00000200, ML_MIDSOLID = 0x00000200,
ML_WRAPMIDTEX = 0x00000400, ML_WRAPMIDTEX = 0x00000400,
// Compat for old lua scripts.
ML_NOSONIC = 0x00000800,
ML_NOTAILS = 0x00001000,
ML_NOKNUX = 0x00002000,
// Apply effect only in netgames // Apply effect only in netgames
ML_NETONLY = 0x00000800, ML_NETONLY = 0x00000800,
ML_NETONLY_OLD = 0x00003800, // Combination of old ML_NOSONIC, ML_NOTAILS and ML_NOKNUX ML_NETONLY_OLD = 0x00003800, // Combination of old ML_NOSONIC, ML_NOTAILS and ML_NOKNUX