diff --git a/src/common/kernel/build.c b/src/common/kernel/build.c index c3de911a2..b0e0f6cee 100644 --- a/src/common/kernel/build.c +++ b/src/common/kernel/build.c @@ -192,7 +192,6 @@ static void siege_cmd(unit * u, order * ord) { region * r = u->region; - unit *u2; building *b; int d, pooled; int bewaffnete, katapultiere = 0; @@ -262,23 +261,13 @@ siege_cmd(unit * u, order * ord) if (d && !curse_active(get_curse(b->attribs, magicwalls_ct))) { b->size -= d; use_pooled(u, it_catapultammo->rtype, GET_SLACK|GET_RESERVE|GET_POOLED_SLACK, d); - d = 100 * d / b->size; - } else d = 0; - - /* meldung fuer belagerer */ - ADDMSG(&u->faction->msgs, msg_message("siege", - "unit building destruction", u, b, d)); - - for (u2 = r->units; u2; u2 = u2->next) freset(u2->faction, FFL_SELECT); - fset(u->faction, FFL_SELECT); - - /* Meldung fuer Burginsassen */ - for (u2 = r->units; u2; u2 = u2->next) { - if (u2->building == b && !fval(u2->faction, FFL_SELECT)) { - fset(u2->faction, FFL_SELECT); - ADDMSG(&u2->faction->msgs, msg_message("siege", - "unit building destruction", u, b, d)); - } + /* send message to the entire region */ + ADDMSG(&r->msgs, msg_message("siege_catapults", + "unit building destruction", u, b, d)); + } else { + /* send message to the entire region */ + ADDMSG(&r->msgs, msg_message("siege", + "unit building", u, b)); } } diff --git a/src/res/messages.xml b/src/res/messages.xml index fbb4359eb..f65d48ece 100644 --- a/src/res/messages.xml +++ b/src/res/messages.xml @@ -3683,7 +3683,7 @@ "$unit($unit) in $region($region) recruits $int($amount) $int($want) people." "$unit($unit) in $region($region) recruits $int($amount) $int($want) people." - + @@ -3693,6 +3693,14 @@ "$building($building) is under siege by $unit($unit). During siege, catapults caused $int($destruction) points destruction." "$building($building) is under siege by $unit($unit). During siege, catapults caused $int($destruction) points destruction." + + + + + + "$unit($unit) belagert $building($building)." + "$building($building) is under siege by $unit($unit)." +