Clean up casts from struct FOO * to struct emp_qelem *

[empserver] / src / lib / subs / shpsub.c

diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index c88593f1ee011d67f49961db72119a3e99a52de3..cb73c6360f7a70807631403307a47e3202d0180c 100644 (file)
--- a/src/lib/subs/shpsub.c
+++ b/src/lib/subs/shpsub.c
@@ -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);
     }
 }