From 1fe02019cde38a56d28538e19e120afd81e4ed0a Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 17 Feb 2007 12:59:57 +0000 Subject: [PATCH] http://eressea.upb.de/mantis/view.php?id=906 "Wegfindungsprobleme" beim Gwyrrd-Zauber "Magischer Pfad" Der Test auf den curse ist jetzt so, dass man sowohl hinein als auch hinaus die Strasse benutzen kann. --- src/common/kernel/movement.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c index d8ea72696..1c8a0ea0c 100644 --- a/src/common/kernel/movement.c +++ b/src/common/kernel/movement.c @@ -1045,16 +1045,16 @@ roadto(const region * r, direction_t dir) region * r2; static const curse_type * roads_ct = NULL; - if (roads_ct == NULL) roads_ct = ct_find("magicstreet"); - if (roads_ct!=NULL) { - curse *c = get_curse(r->attribs, roads_ct); - if (c!=NULL) return true; - } - if (dir>=MAXDIRECTIONS || dir<0) return false; r2 = rconnect(r, dir); if (r == NULL || r2 == NULL) return false; + if (roads_ct == NULL) roads_ct = ct_find("magicstreet"); + if (roads_ct!=NULL) { + if (get_curse(r->attribs, roads_ct)!=NULL) return true; + if (get_curse(r2->attribs, roads_ct)!=NULL) return true; + } + if (r->terrain->max_road == 0) return false; if (r2->terrain->max_road == 0) return false; if (rroad(r, dir) < r->terrain->max_road) return false;