re-merge objects removed from containers when pack is full

- affects failed removal of a partial count of objects due to a full pack
2002-03-30 20:56:09 +00:00
parent 750c6b2a36
commit adf468910c
3 changed files with 17 additions and 3 deletions
@@ -2178,8 +2178,13 @@ boolean put_in;
 			/* special split case also handled by askchain() */
 		    }
 		    res = put_in ? in_container(otmp) : out_container(otmp);
-		    if (res < 0)
+		    if (res < 0) {
+			if (otmp != pick_list[i].item.a_obj) {
+			    /* split occurred, merge again */
+			    (void) merged(&pick_list[i].item.a_obj, &otmp);
+			}
 			break;
+		    }
 		}
 		free((genericptr_t)pick_list);
 	}