diff --git a/res/core/messages.xml b/res/core/messages.xml index 43939b2b4..a3d7ad6e8 100644 --- a/res/core/messages.xml +++ b/res/core/messages.xml @@ -1212,23 +1212,6 @@ "$unit($unit) dies from poison damage taken in $region($region)." - - - - - - - "$int($amount) Personen in $unit($unit) in $region($region) ertrinken." - "$int($amount) people in $unit($unit) in $region($region) drown." - - - - - - - "$unit($unit) nimmt Schaden auf dem Wasser in $region($region)." - "$unit($unit) is taking damage on the water." - diff --git a/src/randenc.c b/src/randenc.c index 801aac4c4..fa6e3e951 100644 --- a/src/randenc.c +++ b/src/randenc.c @@ -528,29 +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 (!(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); }