From d68a0b96c62b31cc7bf6ca72cb04ec55cea6b013 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Wed, 10 Mar 2004 18:25:05 +0000
Subject: [PATCH] (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.

---
 include/prototypes.h    |  2 +-
 src/lib/update/finish.c |  8 +-------
 src/lib/update/sect.c   | 14 +++++---------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/include/prototypes.h b/include/prototypes.h
index ec0cdbe0..9ea253b1 100644
--- 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 bd9093e5..6f5e2b94 100644
--- 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 01e63c06..f35646dc 100644
--- 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;
 }
 
 /*