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

more obj panic feedback

Browse Source
This commit is contained in:
PatR
2025-04-20 15:07:11 -07:00
parent f9af1aa0cf
commit 617b7588cc
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mkobj.c
+12 -12
View File
@@ -2454,7 +2454,7 @@ remove_object(struct obj *otmp)
coordxy y = otmp->oy; coordxy y = otmp->oy;
if (otmp->where != OBJ_FLOOR) if (otmp->where != OBJ_FLOOR)
panic("remove_object: obj not on floor"); panic("remove_object: obj where=%d, not on floor", otmp->where);
extract_nexthere(otmp, &svl.level.objects[x][y]); extract_nexthere(otmp, &svl.level.objects[x][y]);
extract_nobj(otmp, &fobj); extract_nobj(otmp, &fobj);
if (otmp->otyp == BOULDER) if (otmp->otyp == BOULDER)
@@ -2529,7 +2529,7 @@ obj_extract_self(struct obj *obj)
extract_nobj(obj, &gb.billobjs); extract_nobj(obj, &gb.billobjs);
break; break;
default: default:
panic("obj_extract_self"); panic("obj_extract_self, where=%d", obj->where);
break; break;
} }
} }
@@ -2593,7 +2593,7 @@ add_to_minv(struct monst *mon, struct obj *obj)
struct obj *otmp; struct obj *otmp;
if (obj->where != OBJ_FREE) if (obj->where != OBJ_FREE)
panic("add_to_minv: obj not free"); panic("add_to_minv: obj where=%d, not free", obj->where);
/* merge if possible */ /* merge if possible */
for (otmp = mon->minvent; otmp; otmp = otmp->nobj) for (otmp = mon->minvent; otmp; otmp = otmp->nobj)
@@ -2621,7 +2621,7 @@ add_to_container(struct obj *container, struct obj *obj)
struct obj *otmp; struct obj *otmp;
if (obj->where != OBJ_FREE) if (obj->where != OBJ_FREE)
panic("add_to_container: obj not free"); panic("add_to_container: obj where=%d, not free", obj->where);
if (container->where != OBJ_INVENT && container->where != OBJ_MINVENT) if (container->where != OBJ_INVENT && container->where != OBJ_MINVENT)
obj_no_longer_held(obj); obj_no_longer_held(obj);
@@ -2641,7 +2641,7 @@ void
add_to_migration(struct obj *obj) add_to_migration(struct obj *obj)
{ {
if (obj->where != OBJ_FREE) if (obj->where != OBJ_FREE)
panic("add_to_migration: obj not free"); panic("add_to_migration: obj where=%d, not free", obj->where);
if (obj->unpaid) /* caller should have changed unpaid item to stolen */ if (obj->unpaid) /* caller should have changed unpaid item to stolen */
impossible("unpaid object migrating to another level? [%s]", impossible("unpaid object migrating to another level? [%s]",
@@ -2663,7 +2663,7 @@ void
add_to_buried(struct obj *obj) add_to_buried(struct obj *obj)
{ {
if (obj->where != OBJ_FREE) if (obj->where != OBJ_FREE)
panic("add_to_buried: obj not free"); panic("add_to_buried: obj where=%d, not free", obj->where);
obj->where = OBJ_BURIED; obj->where = OBJ_BURIED;
obj->nobj = svl.level.buriedobjlist; obj->nobj = svl.level.buriedobjlist;
@@ -2776,12 +2776,12 @@ dobjsfree(void)
struct obj *otmp; struct obj *otmp;
while (go.objs_deleted) { while (go.objs_deleted) {
otmp = go.objs_deleted->nobj; otmp = go.objs_deleted;
if (go.objs_deleted->where != OBJ_DELETED) go.objs_deleted = otmp->nobj;
panic("dobjsfree: obj where is not OBJ_DELETED"); if (otmp->where != OBJ_DELETED)
obj_extract_self(go.objs_deleted); panic("dobjsfree: obj where=%d, not OBJ_DELETED", otmp->where);
dealloc_obj_real(go.objs_deleted); obj_extract_self(otmp);
go.objs_deleted = otmp; dealloc_obj_real(otmp);
} }
} }