diff --git a/src/common/gamecode/spy.c b/src/common/gamecode/spy.c index 67b93010d..76b123637 100644 --- a/src/common/gamecode/spy.c +++ b/src/common/gamecode/spy.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: spy.c,v 1.4 2001/02/07 20:42:30 corwin Exp $ + * $Id: spy.c,v 1.5 2001/02/19 16:45:23 katze Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -118,7 +118,7 @@ setstealth(unit * u, strlist * S) /* Pseudodrachen auch */ - if (u->race == RC_PSEUDODRAGON) { + if (u->race == RC_PSEUDODRAGON || RC_BIRTHDAYDRAGON) { t = findrace(s); if(t==RC_PSEUDODRAGON||t==RC_FIREDRAGON||t==RC_DRAGON||t==RC_WYRM) { u->irace = t; diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c index 0b176fb60..7f7ef3528 100644 --- a/src/common/kernel/movement.c +++ b/src/common/kernel/movement.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: movement.c,v 1.13 2001/02/19 16:22:02 corwin Exp $ + * $Id: movement.c,v 1.14 2001/02/19 16:45:23 katze Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -983,6 +983,7 @@ travel(region * first, unit * u, region * next, int flucht) while (next) { direction_t dir = reldirection(current, next); border * b = get_borders(current, next); + while (b) { if (b->type==&bt_wisps) { region * rl = rconnect(current, (direction_t)((dir+MAXDIRECTIONS-1)%MAXDIRECTIONS)); @@ -993,6 +994,7 @@ travel(region * first, unit * u, region * next, int flucht) else if (j==2 && rr && landregion(rterrain(rr))==landregion(rterrain(next))) next = rr; break; } + if (b->type->move) b->type->move(b, u, current, next); b = b->next; } if (current!=next) { /* !pause */ diff --git a/src/common/kernel/unit.c b/src/common/kernel/unit.c index 31c5c7fab..8e9f1137e 100644 --- a/src/common/kernel/unit.c +++ b/src/common/kernel/unit.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: unit.c,v 1.7 2001/02/18 10:06:10 enno Exp $ + * $Id: unit.c,v 1.8 2001/02/19 16:45:23 katze Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -649,13 +649,6 @@ move_unit(unit * u, region * r, unit ** ulist) if (u->region == r) return; if (!ulist) ulist = (&r->units); if (u->region) { - /* Das sollte besser über block_type::move() abgewickelt werden! */ - border * b = get_borders(u->region, r); - while (b) { - if (b->type->move) b->type->move(b, u, u->region, r); - b = b->next; - } -/* END FIREWALLS */ setguard(u, GUARD_NONE); fset(u, FL_MOVED); if (u->ship || u->building) leave(u->region, u);