From 272eb7fa75789b4ed15cf96b47cbc1e2242e9535 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 8 Sep 2004 23:00:48 +0000 Subject: [PATCH] =?UTF-8?q?http://eressea.upb.de/mantis/bug=5Fview=5Fpage.?= =?UTF-8?q?php=3Fbug=5Fid=3D0000193=20-=20dritter=20und=20letzter=20commit?= =?UTF-8?q?=20f=C3=BCr=20die=20Durchreisemeldungen=20von=20Reitern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/kernel/movement.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c index 236fc67e6..e4287571e 100644 --- a/src/common/kernel/movement.c +++ b/src/common/kernel/movement.c @@ -1335,22 +1335,24 @@ travel(unit * u, region * next, int flucht, region_list ** routep) m--; if (m > 0) { region_list *rlist = route; + char * p = buf; travelthru(u, first); while (rlist!=NULL) { region * r = rlist->data; - char * p; - travelthru(u, r); - if (rlist!=route) { - if (rlist->next==NULL) scat(" und "); - else scat(", "); - } - - p = buf+strlen(buf); - MSG(("travelthru_trail", "region", r), p, sizeof(buf)-strlen(buf), u->faction->locale, u->faction); rlist = rlist->next; + if (rlist!=NULL) { + MSG(("travelthru_trail", "region", r), p, sizeof(buf) - (p-buf), + u->faction->locale, u->faction); + if (rlist->next!=NULL) { + if (rlist->next->data==current) scat(" und "); + else scat(", "); + } + p += strlen(p); + } + travelthru(u, r); } } ADDMSG(&u->faction->msgs, msg_message("travel",