From c274d0820ccd8cb6ea3f875fa1a306fd47f360f8 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 25 Jan 2014 11:25:43 +0100 Subject: [PATCH] Clean up casts from union empobj_storage * to struct empobj * Take the address of member gen instead. Signed-off-by: Markus Armbruster --- src/lib/commands/miss.c | 4 ++-- src/lib/subs/mission.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/commands/miss.c b/src/lib/commands/miss.c index 86050725..804ed01b 100644 --- a/src/lib/commands/miss.c +++ b/src/lib/commands/miss.c @@ -165,7 +165,7 @@ mission(void) radius = 9999; while (nxtitem(&ni, &item)) { - gp = (struct empobj *)&item; + gp = &item.gen; if (!player->owner || gp->own == 0) continue; @@ -300,7 +300,7 @@ show_mission(struct nstr_item *np) struct empobj *gp; while (nxtitem(np, &item)) { - gp = (struct empobj *)&item; + gp = &item.gen; if (!player->owner || gp->own == 0) continue; diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c index eab63321..9d287d57 100644 --- a/src/lib/subs/mission.c +++ b/src/lib/subs/mission.c @@ -289,7 +289,7 @@ build_mission_list_type(struct genlist mi[], unsigned char act[], snxtitem_all(&ni, type); while (nxtitem(&ni, &item)) { - gp = (struct empobj *)&item; + gp = &item.gen; if (!act[gp->own]) continue;