diff --git a/src/doomdata.h b/src/doomdata.h
index d3c43b272bcadf8f95b7841f9db35536eac41201..24675d427f8a71adf90bd12c1cca6b8169bcc510 100644
--- a/src/doomdata.h
+++ b/src/doomdata.h
@@ -195,6 +195,9 @@ typedef struct
#pragma pack()
#endif
+#define NUMMAPTHINGARGS 6
+#define NUMMAPTHINGSTRINGARGS 2
+
// Thing definition, position, orientation and type,
// plus visibility flags and attributes.
typedef struct
@@ -207,6 +210,9 @@ typedef struct
UINT8 extrainfo;
fixed_t scale;
INT16 tag;
+ INT32 args[NUMMAPTHINGARGS];
+ char *stringargs[NUMMAPTHINGSTRINGARGS];
+
struct mobj_s *mobj;
} mapthing_t;
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index 48a5038289bb6425a564f4e0e7d7917bbd4846de..28a0e9b988da94a654d22874d4a0689dfe1e05ce 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -175,6 +175,9 @@ static const struct {
{META_SIDENUM, "line_t.sidenum"},
{META_LINEARGS, "line_t.args"},
{META_LINESTRINGARGS, "line_t.stringargs"},
+
+ {META_THINGARGS, "mapthing.args"},
+ {META_THINGSTRINGARGS, "mapthing.stringargs"},
#ifdef HAVE_LUA_SEGS
{META_NODEBBOX, "node_t.bbox"},
{META_NODECHILDREN, "node_t.children"},
diff --git a/src/lua_libs.h b/src/lua_libs.h
index 375041506e7f7a480b1485fa7214cb526338b4c2..5bcb36b42a228ef3344457e6e2b20e585da7eee2 100644
--- a/src/lua_libs.h
+++ b/src/lua_libs.h
@@ -54,6 +54,8 @@ extern lua_State *gL;
#define META_SIDENUM "LINE_T*SIDENUM"
#define META_LINEARGS "LINE_T*ARGS"
#define META_LINESTRINGARGS "LINE_T*STRINGARGS"
+#define META_THINGARGS "MAPTHING_T*ARGS"
+#define META_THINGSTRINGARGS "MAPTHING_T*STRINGARGS"
#ifdef HAVE_LUA_SEGS
#define META_NODEBBOX "NODE_T*BBOX"
#define META_NODECHILDREN "NODE_T*CHILDREN"
diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c
index dca4721e9e9cd13916d02608aa8bdd946b03a872..a74f785e8d9477c9e9c3a7cfed7111a70cc35dd3 100644
--- a/src/lua_mobjlib.c
+++ b/src/lua_mobjlib.c
@@ -761,6 +761,42 @@ static int mobj_set(lua_State *L)
#undef NOSETPOS
#undef NOFIELD
+// args, i -> args[i]
+static int thingargs_get(lua_State *L)
+{
+ INT32 *args = *((INT32**)luaL_checkudata(L, 1, META_THINGARGS));
+ int i = luaL_checkinteger(L, 2);
+ if (i < 0 || i >= NUMMAPTHINGARGS)
+ return luaL_error(L, LUA_QL("mapthing_t.args") " index cannot be %d", i);
+ lua_pushinteger(L, args[i]);
+ return 1;
+}
+
+// #args -> NUMMAPTHINGARGS
+static int thingargs_len(lua_State* L)
+{
+ lua_pushinteger(L, NUMMAPTHINGARGS);
+ return 1;
+}
+
+// stringargs, i -> stringargs[i]
+static int thingstringargs_get(lua_State *L)
+{
+ char **stringargs = *((char***)luaL_checkudata(L, 1, META_THINGSTRINGARGS));
+ int i = luaL_checkinteger(L, 2);
+ if (i < 0 || i >= NUMMAPTHINGSTRINGARGS)
+ return luaL_error(L, LUA_QL("mapthing_t.stringargs") " index cannot be %d", i);
+ lua_pushstring(L, stringargs[i]);
+ return 1;
+}
+
+// #stringargs -> NUMMAPTHINGSTRINGARGS
+static int thingstringargs_len(lua_State *L)
+{
+ lua_pushinteger(L, NUMMAPTHINGSTRINGARGS);
+ return 1;
+}
+
static int mapthing_get(lua_State *L)
{
mapthing_t *mt = *((mapthing_t **)luaL_checkudata(L, 1, META_MAPTHING));
@@ -802,6 +838,16 @@ static int mapthing_get(lua_State *L)
number = mt->extrainfo;
else if(fastcmp(field,"tag"))
number = mt->tag;
+ else if(fastcmp(field,"args"))
+ {
+ LUA_PushUserdata(L, mt->args, META_THINGARGS);
+ return 1;
+ }
+ else if(fastcmp(field,"stringargs"))
+ {
+ LUA_PushUserdata(L, mt->stringargs, META_THINGSTRINGARGS);
+ return 1;
+ }
else if(fastcmp(field,"mobj")) {
LUA_PushUserdata(L, mt->mobj, META_MOBJ);
return 1;
@@ -918,6 +964,22 @@ int LUA_MobjLib(lua_State *L)
lua_setfield(L, -2, "__newindex");
lua_pop(L,1);
+ luaL_newmetatable(L, META_THINGARGS);
+ lua_pushcfunction(L, thingargs_get);
+ lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, thingargs_len);
+ lua_setfield(L, -2, "__len");
+ lua_pop(L, 1);
+
+ luaL_newmetatable(L, META_THINGSTRINGARGS);
+ lua_pushcfunction(L, thingstringargs_get);
+ lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, thingstringargs_len);
+ lua_setfield(L, -2, "__len");
+ lua_pop(L, 1);
+
luaL_newmetatable(L, META_MAPTHING);
lua_pushcfunction(L, mapthing_get);
lua_setfield(L, -2, "__index");
diff --git a/src/p_setup.c b/src/p_setup.c
index c836f671aeaf9a092604ba614404387153c0d647..b0cb4f54368696dd4746db3112a7a4da0e225049 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -1283,6 +1283,8 @@ static void P_LoadThings(UINT8 *data)
mt->extrainfo = (UINT8)(mt->type >> 12);
mt->scale = FRACUNIT;
mt->tag = 0;
+ memset(mt->args, 0, NUMMAPTHINGARGS*sizeof(*mt->args));
+ memset(mt->stringargs, 0x00, NUMMAPTHINGSTRINGARGS*sizeof(*mt->stringargs));
mt->pitch = mt->roll = 0;
mt->type &= 4095;
@@ -1587,6 +1589,22 @@ static void ParseTextmapThingParameter(UINT32 i, char *param, char *val)
mapthings[i].options |= MTF_OBJECTSPECIAL;
else if (fastcmp(param, "ambush") && fastcmp("true", val))
mapthings[i].options |= MTF_AMBUSH;
+
+ else if (fastncmp(param, "arg", 3) && strlen(param) > 3)
+ {
+ size_t argnum = atol(param + 3);
+ if (argnum >= NUMMAPTHINGARGS)
+ return;
+ mapthings[i].args[argnum] = atol(val);
+ }
+ else if (fastncmp(param, "stringarg", 9) && strlen(param) > 9)
+ {
+ size_t argnum = param[9] - '0';
+ if (argnum >= NUMMAPTHINGSTRINGARGS)
+ return;
+ mapthings[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL);
+ M_Memcpy(mapthings[i].stringargs[argnum], val, strlen(val) + 1);
+ }
}
/** From a given position table, run a specified parser function through a {}-encapsuled text.
@@ -1779,13 +1797,15 @@ static void P_LoadTextmap(void)
{
// Defaults.
mt->x = mt->y = 0;
- mt->angle = 0;
+ mt->angle = mt->pitch = mt->roll = 0;
mt->type = 0;
mt->options = 0;
mt->z = 0;
mt->extrainfo = 0;
mt->scale = FRACUNIT;
mt->tag = 0;
+ memset(mt->args, 0, NUMMAPTHINGARGS*sizeof(*mt->args));
+ memset(mt->stringargs, 0x00, NUMMAPTHINGSTRINGARGS*sizeof(*mt->stringargs));
mt->mobj = NULL;
TextmapParse(mapthingsPos[i], i, ParseTextmapThingParameter);