(dodeliver): Remove parameter vec, work with sp->sct_item[] instead.

This is safe, because the only caller passed a copy of the latter
created with getvec(), and dodeliver() doesn't change it.  Caller
changed.  Return value no longer needed, remove.

diff --git a/include/prototypes.h b/include/prototypes.h
index ec0cdbe08f979439789e574a63bb757ea8597c2f..9ea253b18ffdb9134af7cdf2af36235555d22af9 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -615,7 +615,7 @@ extern void guerrilla(struct sctstr *);
 /* sail.c */
 extern void sail_ship(natid);
 /* sect.c */
-extern int dodeliver(struct sctstr *, int *);
+extern void dodeliver(struct sctstr *);
 extern void do_fallout(register struct sctstr *, register int);
 extern void spread_fallout(struct sctstr *, int);
 extern void decay_fallout(struct sctstr *, int);

diff --git a/src/lib/update/finish.c b/src/lib/update/finish.c
index bd9093e52c69a3a0be5f4e1f3c7a0ad52b0e26c4..6f5e2b9463621eec9709605c00480c3ea7f926bd 100644 (file)
--- a/src/lib/update/finish.c
+++ b/src/lib/update/finish.c
@@ -80,8 +80,6 @@ finish_sects(int etu)
     register struct sctstr *sp;
     struct natstr *np;
     int n;
-    int vec[I_MAX + 1];
-    int changed;
     struct distinfo *infptr;
 
     if (g_distptrs == (struct distinfo *)0) {
@@ -112,11 +110,7 @@ finish_sects(int etu)
        np = getnatp(sp->sct_own);
        if (np->nat_money < 0)
            continue;
-       changed = 0;
-       if (getvec(VT_ITEM, vec, (s_char *)sp, EF_SECTOR) > 0)
-           changed += dodeliver(sp, vec);
-       if (changed)
-           putvec(VT_ITEM, vec, (s_char *)sp, EF_SECTOR);
+       dodeliver(sp);
     }
     logerror("done delivering\n");
 

diff --git a/src/lib/update/sect.c b/src/lib/update/sect.c
index 01e63c06182d2f7b57322815eedb8f1fb081d0ef..f35646dcf377288182ecdfb08e36ff8f6924c4e7 100644 (file)
--- a/src/lib/update/sect.c
+++ b/src/lib/update/sect.c
@@ -55,34 +55,30 @@
 #include "lost.h"
 #include "gen.h"
 
-int
-dodeliver(struct sctstr *sp, int *vec)
+void
+dodeliver(struct sctstr *sp)
 {
     register int i;
     int thresh;
     int dir;
     int plague;
     int n;
-    int changed;
 
     if (sp->sct_mobil <= 0)
-       return 0;
-    changed = 0;
+       return;
     plague = sp->sct_pstage;
     for (i = 1; i <= I_MAX; i++) {
        if (sp->sct_del[i] == 0)
            continue;
        thresh = sp->sct_del[i] & ~0x7;
        dir = sp->sct_del[i] & 0x7;
-       n = deliver(sp, &ichr[i], dir, thresh, vec[i], plague);
+       n = deliver(sp, &ichr[i], dir, thresh, sp->sct_item[i], plague);
        if (n > 0) {
-           vec[i] -= n;
-           changed++;
+           sp->sct_item[i] -= n;
            if (sp->sct_mobil <= 0)
                break;
        }
     }
-    return changed;
 }
 
 /*