empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(upd_ship, upd_land, do_plague): Work directly on item arrays instead

Browse source 
of copies made by getvec().  This is safe, because the new code
changes the item array precisely when the old code writes back a
changed copy.
(starv_ships, starv_units): Replace getvec() by direct, read-only item
access.
(feed_ship, feed_land): Remove parameter vec, work with sp->shp_item[]
and lp->lnd_item[] instead.
(plague_people): Change argument type to match uncopied item arrays.
This commit is contained in:
Markus Armbruster 2004-03-11 18:10:25 +00:00
parent 979f74709b
commit c922b571db
5 changed files with 55 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/update/plague.c
View file

@ -52,7 +52,6 @@ static int infect_people(struct natstr *, struct sctstr *);
void
do_plague(struct sctstr *sp, struct natstr *np, int etu)
{
int vec[I_MAX + 1];
u_short pstage, ptime;
int n;
@ -66,8 +65,7 @@ do_plague(struct sctstr *sp, struct natstr *np, int etu)
pstage = infect_people(np, sp);
ptime = 0;
} else {
getvec(VT_ITEM, vec, (s_char *)sp, EF_SECTOR);
n = plague_people(np, vec, &pstage, &ptime, etu);
n = plague_people(np, sp->sct_item, &pstage, &ptime, etu);
switch (n) {
case PLG_DYING:
wu(0, sp->sct_own, "PLAGUE deaths reported in %s.\n",
@ -107,7 +105,6 @@ do_plague(struct sctstr *sp, struct natstr *np, int etu)
default:
break;
}
putvec(VT_ITEM, vec, (s_char *)sp, EF_SECTOR);
}
if (sp->sct_item[I_CIVIL] == 0 && sp->sct_item[I_MILIT] == 0
&& !has_units(sp->sct_x, sp->sct_y, sp->sct_own, 0)) {
@ -154,7 +151,7 @@ infect_people(struct natstr *np, struct sctstr *sp)
* stage. No reports generated here anymore.
*/
int
plague_people(struct natstr *np, register int *vec,
plague_people(struct natstr *np, short *vec,
u_short *pstage, u_short *ptime,
int etus)
{