diff --git a/src/randenc.c b/src/randenc.c index 801aac4c4..ddc0dd386 100644 --- a/src/randenc.c +++ b/src/randenc.c @@ -528,24 +528,13 @@ void drown(region * r) unit **up = up = &r->units; while (*up) { unit *u = *up; - int amphibian_level = 0; + if (u->ship || u_race(u) == get_race(RC_SPELL) || u->number == 0) { up = &u->next; continue; } - if (amphibian_level) { - int dead = damage_unit(u, "5d1", false, false); - if (dead) { - ADDMSG(&u->faction->msgs, msg_message("drown_amphibian_dead", - "amount unit region", dead, u, r)); - } - else { - ADDMSG(&u->faction->msgs, msg_message("drown_amphibian_nodead", - "unit region", u, r)); - } - } - else if (!(canswim(u) || canfly(u))) { + if (!(canswim(u) || canfly(u))) { scale_number(u, 0); ADDMSG(&u->faction->msgs, msg_message("drown", "unit region", u, r)); }