X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Flib%2Fcommon%2Fxundump.c;h=abef9c27e664d1a6b73198938a3d44de72e2c9e8;hp=69914c3377e01b186707bc5177a356d98149fb4c;hb=1492845c;hpb=02254398e8423c0410991f7905ca45747db0c6ef

diff --git a/src/lib/common/xundump.c b/src/lib/common/xundump.c
index 69914c337..abef9c27e 100644
--- a/src/lib/common/xundump.c
+++ b/src/lib/common/xundump.c
@@ -482,17 +482,16 @@ static void *
 getobj(void)
 {
     struct empfile *ep = &empfile[cur_type];
-    int need_sentinel = !EF_IS_GAME_STATE(cur_type);
 
     if (!cur_obj) {
-	cur_obj_is_blank = cur_id >= ep->fids - !!need_sentinel;
+	cur_obj_is_blank = cur_id >= ep->fids;
 	if (cur_obj_is_blank) {
-	    if (ef_ensure_space(cur_type, cur_id + !!need_sentinel, 1))
+	    if (ef_ensure_space(cur_type, cur_id, 1))
 		cur_obj = ef_ptr(cur_type, cur_id);
 	    /* FIXME diagnose out of dynamic memory vs. static table full */
 	    if (!cur_obj)
 		gripe("Can't put ID %d into table %s, it holds only 0..%d.",
-		      cur_id, ep->name, ep->fids - !!need_sentinel - 1);
+		      cur_id, ep->name, ep->fids - 1);
 	} else
 	    cur_obj = ef_ptr(cur_type, cur_id);
     }
@@ -962,13 +961,8 @@ static int
 xubody(FILE *fp)
 {
     struct empfile *ep = &empfile[cur_type];
-    int need_sentinel = !EF_IS_GAME_STATE(cur_type);
-    int old_maxid = ep->fids;
     int i, maxid, ch;
 
-    if (old_maxid == 0 && need_sentinel)
-	ef_ensure_space(cur_type, 0, 1);
-
     maxid = 0;
     for (i = 0;; ++i) {
 	while ((ch = skipfs(fp)) == '\n')
@@ -983,12 +977,6 @@ xubody(FILE *fp)
 	maxid = MAX(maxid, cur_id + 1);
     }
 
-    if (maxid >= old_maxid && need_sentinel) {
-	/* appended a sentinel, strip it off */
-	ep->fids--;
-	ep->cids--;
-    }
-
     if (CANT_HAPPEN(maxid > ep->fids))
 	maxid = ep->fids;
     if (maxid < ep->fids) {