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

Add lua object references

Browse Source 
Whenever a lua script references a core struct obj, increment a counter
in the obj struct. Core code will not free the obj, if there are any
lua references pointing to it, just makes it free-floating.
When lua script ends, the lua gc will free the free-floating objects.

Also exposes u.inventory to lua.

Breaks save and bones compat.
This commit is contained in:
Pasi Kallinen
2019-12-26 18:43:39 +02:00
parent 7ea7058c01
commit 6d8d3a9557
7 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mkobj.c
View File

@@ -444,6 +444,7 @@ long num;
obj->owt = weight(obj);
otmp->quan = num;
otmp->owt = weight(otmp); /* -= obj->owt ? */
otmp->lua_ref_cnt = 0;
g.context.objsplit.parent_oid = obj->o_id;
g.context.objsplit.child_oid = otmp->o_id;
@@ -797,6 +798,7 @@ boolean artif;
otmp->lknown = 0;
otmp->cknown = 0;
otmp->corpsenm = NON_PM;
otmp->lua_ref_cnt = 0;
if (init) {
switch (let) {
@@ -2178,8 +2180,10 @@ struct obj *obj;
* list must track all objects that can have a light source
* attached to it (and also requires lamplit to be set).
*/
if (obj_sheds_light(obj))
if (obj_sheds_light(obj)) {
del_light_source(LS_OBJECT, obj_to_any(obj));
obj->lamplit = 0;
}
if (obj == g.thrownobj)
g.thrownobj = 0;
@@ -2188,6 +2192,8 @@ 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 */
free((genericptr_t) obj);
}