Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Enno Rehling 2007-02-17 12:59:57 +00:00
parent bbe226e22e
commit 1fe02019cd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/kernel/movement.c
View File

@ -1045,16 +1045,16 @@ roadto(const region * r, direction_t dir)
region * r2; region * r2;
static const curse_type * roads_ct = NULL; 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; if (dir>=MAXDIRECTIONS || dir<0) return false;
r2 = rconnect(r, dir); r2 = rconnect(r, dir);
if (r == NULL || r2 == NULL) return false; 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 (r->terrain->max_road == 0) return false;
if (r2->terrain->max_road == 0) return false; if (r2->terrain->max_road == 0) return false;
if (rroad(r, dir) < r->terrain->max_road) return false; if (rroad(r, dir) < r->terrain->max_road) return false;