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

(have_looked,have_found,set_have_looked,set_have_found,print_found):

Browse source 
collapse to shiplist function set (add,free,print,on). Fix bug where ship
uid was a unsigned char instead of short.  Switch to head pointer instead
of head record with a linked list. Add a free().
This commit is contained in:
Ron Koenderink 2004-12-16 11:12:28 +00:00
parent fd700f235b
commit 042372d4c2
7 changed files with 48 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/lib/subs/aircombat.c
View file

@ -95,17 +95,13 @@ ac_encounter(struct emp_qelem *bomb_list, struct emp_qelem *esc_list,
struct natstr *over, *mynatp;
struct plist *plp;
int evaded;
struct shiplook head;
struct shiplook *s, *s2;
struct shiplist *head = NULL;
int changed = 0;
int intown = 0; /* Last owner to intercept */
/* We want to only intercept once per sector per owner. So, if we overfly
a sector, and then overfly some land units or ships, we don't want to
potentially intercept 3 times. */
memset(&head, 0, sizeof(struct shiplook));
head.uid = -1;
plp = (struct plist *)bomb_list->q_forw;
plane_owner = plp->plane.pln_own;
@ -271,14 +267,8 @@ ac_encounter(struct emp_qelem *bomb_list, struct emp_qelem *esc_list,
writemap(player->cnum);
/* Now, if the bomber and escort lists are empty, we are done */
if (QEMPTY(bomb_list) && QEMPTY(esc_list)) {
if (mission_flags & P_A) {
s = head.next;
while (s != (struct shiplook *)0) {
s2 = s;
s = s->next;
free(s2);
}
}
if (mission_flags & P_A)
free_shiplist(&head);
return;
}
@ -356,15 +346,8 @@ ac_encounter(struct emp_qelem *bomb_list, struct emp_qelem *esc_list,
}
}
}
if ((mission_flags & P_A) && (head.uid != -1)) {
s = head.next;
while (s != (struct shiplook *)0) {
s2 = s;
s = s->next;
free(s2);
}
}
if (mission_flags & P_A)
free_shiplist(&head);
}
static int