nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Lua struct obj improvements

Browse Source 
If the core frees the obj struct referred by lua, don't free it,
just mark it as OBJ_LUAFREE - lua will free it in gc once all
the references to it are gone.
This commit is contained in:
Pasi Kallinen
2020-01-01 13:25:55 +02:00
parent 2ae7cf02ea
commit 7e07cef197
5 changed files with 58 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mkobj.c
View File

@@ -1969,6 +1969,7 @@ struct monst *mtmp;
* OBJ_MIGRATING migrating chain
* OBJ_BURIED level.buriedobjs chain
* OBJ_ONBILL on g.billobjs chain
* OBJ_LUAFREE obj is dealloc'd from core, but still used by lua
*/
void
obj_extract_self(obj)
@@ -1976,6 +1977,7 @@ struct obj *obj;
{
switch (obj->where) {
case OBJ_FREE:
case OBJ_LUAFREE:
break;
case OBJ_FLOOR:
remove_object(obj);
@@ -2161,7 +2163,7 @@ void
dealloc_obj(obj)
struct obj *obj;
{
if (obj->where != OBJ_FREE)
if (obj->where != OBJ_FREE && obj->where != OBJ_LUAFREE)
panic("dealloc_obj: obj not free");
if (obj->nobj)
panic("dealloc_obj with nobj");
@@ -2192,8 +2194,11 @@ struct obj *obj;
if (obj->oextra)
dealloc_oextra(obj);
if (obj->lua_ref_cnt)
return; /* obj is referenced from a lua script, let lua gc free it */
if (obj->lua_ref_cnt) {
/* obj is referenced from a lua script, let lua gc free it */
obj->where = OBJ_LUAFREE;
return;
}
free((genericptr_t) obj);
}
@@ -2430,7 +2435,8 @@ const char *mesg;
static const char *obj_state_names[NOBJ_STATES] = { "free", "floor",
"contained", "invent",
"minvent", "migrating",
"buried", "onbill" };
"buried", "onbill",
"luafree" };
static const char *
where_name(obj)