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

Clean up casts from struct FOO * to struct emp_qelem *

Browse source 
Take the address of the queue member instead.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-01-25 11:17:09 +01:00
parent 4d899f6e6d
commit 52a40481cb
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/subs/shpsub.c
View file

@ -118,7 +118,7 @@ shp_nav(struct emp_qelem *list, double *minmobp, double *maxmobp,
if (sp->shp_own != actor) {
mpr(actor, "%s was sunk at %s\n",
prship(sp), xyas(sp->shp_x, sp->shp_y, actor));
emp_remque((struct emp_qelem *)mlp);
emp_remque(&mlp->queue);
free(mlp);
continue;
}
@ -290,7 +290,7 @@ shp_stays(natid actor, char *str, struct ulist *mlp)
xyas(mlp->unit.ship.shp_x, mlp->unit.ship.shp_y, actor));
mlp->unit.ship.shp_mobil = (int)mlp->mobil;
putship(mlp->unit.ship.shp_uid, &mlp->unit.ship);
emp_remque((struct emp_qelem *)mlp);
emp_remque(&mlp->queue);
free(mlp);
}
@ -377,7 +377,7 @@ shp_damage_one(struct ulist *mlp, int dam)
shipdamage(&mlp->unit.ship, dam);
putship(mlp->unit.ship.shp_uid, &mlp->unit.ship);
if (!mlp->unit.ship.shp_own) {
emp_remque((struct emp_qelem *)mlp);
emp_remque(&mlp->queue);
free(mlp);
}
}