From 2fe95f3d615d53744ce0f463f6f232cb08d55bc0 Mon Sep 17 00:00:00 2001 From: Philipp Dreher Date: Mon, 2 Nov 2015 13:12:19 +0100 Subject: [PATCH] integration of the separate if-conditions and simplification of the loop --- src/randenc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/randenc.c b/src/randenc.c index ddc0dd386..fa6e3e951 100644 --- a/src/randenc.c +++ b/src/randenc.c @@ -529,17 +529,12 @@ void drown(region * r) while (*up) { unit *u = *up; - if (u->ship || u_race(u) == get_race(RC_SPELL) || u->number == 0) { - up = &u->next; - continue; - } - - if (!(canswim(u) || canfly(u))) { + if (!(u->ship || u_race(u) == get_race(RC_SPELL) || u->number == 0 || canswim(u) || canfly(u))) { scale_number(u, 0); ADDMSG(&u->faction->msgs, msg_message("drown", "unit region", u, r)); } - if (*up == u) - up = &u->next; + + up = &u->next; } remove_empty_units_in_region(r); }