From bf91474325ead0241b14692f4a1965fad08497c4 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 12 Jun 2005 08:44:59 +0000 Subject: [PATCH] =?UTF-8?q?strassengr=C3=B6ssen=20wurden=20falschrum=20int?= =?UTF-8?q?erpretiert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/kernel/border.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/kernel/border.c b/src/common/kernel/border.c index 484960427..0c28bbed7 100644 --- a/src/common/kernel/border.c +++ b/src/common/kernel/border.c @@ -418,14 +418,14 @@ static const char * b_nameroad(const border * b, const region * r, const struct faction * f, int gflags) { region * r2 = (r==b->to)?b->from:b->to; - int local = (r==b->to)?b->data.sa[0]:b->data.sa[1]; + int local = (r==b->from)?b->data.sa[0]:b->data.sa[1]; static char buffer[64]; unused(f); if (gflags & GF_ARTICLE) { if (!(gflags & GF_DETAILED)) strcpy(buffer, "eine Straße"); else if (terrain[rterrain(r)].roadreq<=local) { - int remote = (r!=b->to)?b->data.sa[0]:b->data.sa[1]; + int remote = (r2==b->from)?b->data.sa[0]:b->data.sa[1]; if (terrain[rterrain(r2)].roadreq<=remote) { strcpy(buffer, "eine Straße"); } else { @@ -468,7 +468,7 @@ static boolean b_rvisibleroad(const border * b, const region * r) { int x = b->data.i; - x = (r==b->to)?(x & 0xFFFF):((x>>16) & 0xFFFF); + x = (r==b->from)?b->data.sa[0]:b->data.sa[1]; if (x==0) return false; return (boolean)(b->to==r || b->from==r); }