Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

integration of the separate if-conditions and simplification of the loop

This commit is contained in:
Philipp Dreher 2015-11-02 13:12:19 +01:00
parent 153db447de
commit 2fe95f3d61
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/randenc.c
View File

@ -529,16 +529,11 @@ void drown(region * r)
while (*up) { while (*up) {
unit *u = *up; unit *u = *up;
if (u->ship || u_race(u) == get_race(RC_SPELL) || u->number == 0) { if (!(u->ship || u_race(u) == get_race(RC_SPELL) || u->number == 0 || canswim(u) || canfly(u))) {
up = &u->next;
continue;
}
if (!(canswim(u) || canfly(u))) {
scale_number(u, 0); scale_number(u, 0);
ADDMSG(&u->faction->msgs, msg_message("drown", "unit region", u, r)); 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); remove_empty_units_in_region(r);