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

Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2

Browse Source
This commit is contained in:
nhmall
2019-01-07 18:13:22 -05:00
parent 2e80de0646 d1deafab05
commit 4f11a122c9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mkobj.c
+5 -2
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 mkobj.c $NHDT-Date: 1545951660 2018/12/27 23:01:00 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.139 $ */ /* NetHack 3.6 mkobj.c $NHDT-Date: 1546837153 2019/01/07 04:59:13 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.140 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */ /*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1941,12 +1941,14 @@ struct obj *obj;
case OBJ_CONTAINED: case OBJ_CONTAINED:
extract_nobj(obj, &obj->ocontainer->cobj); extract_nobj(obj, &obj->ocontainer->cobj);
container_weight(obj->ocontainer); container_weight(obj->ocontainer);
obj->ocontainer = (struct obj *) 0; /* clear stale back-link */
break; break;
case OBJ_INVENT: case OBJ_INVENT:
freeinv(obj); freeinv(obj);
break; break;
case OBJ_MINVENT: case OBJ_MINVENT:
extract_nobj(obj, &obj->ocarry->minvent); extract_nobj(obj, &obj->ocarry->minvent);
obj->ocarry = (struct monst *) 0; /* clear stale back-link */
break; break;
case OBJ_MIGRATING: case OBJ_MIGRATING:
extract_nobj(obj, &migrating_objs); extract_nobj(obj, &migrating_objs);
@@ -1983,7 +1985,7 @@ struct obj *obj, **head_ptr;
if (!curr) if (!curr)
panic("extract_nobj: object lost"); panic("extract_nobj: object lost");
obj->where = OBJ_FREE; obj->where = OBJ_FREE;
obj->nobj = NULL; obj->nobj = (struct obj *) 0;
} }
/* /*
@@ -2010,6 +2012,7 @@ struct obj *obj, **head_ptr;
} }
if (!curr) if (!curr)
panic("extract_nexthere: object lost"); panic("extract_nexthere: object lost");
obj->nexthere = (struct obj *) 0;
} }
/* /*