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

Feuerwandfix

This commit is contained in:
Katja Zedel 2001-02-19 16:45:23 +00:00
parent db5e71ea76
commit ad2419c85c
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/gamecode/spy.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2: /* 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 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de)
@ -118,7 +118,7 @@ setstealth(unit * u, strlist * S)
/* Pseudodrachen auch */ /* Pseudodrachen auch */
if (u->race == RC_PSEUDODRAGON) { if (u->race == RC_PSEUDODRAGON || RC_BIRTHDAYDRAGON) {
t = findrace(s); t = findrace(s);
if(t==RC_PSEUDODRAGON||t==RC_FIREDRAGON||t==RC_DRAGON||t==RC_WYRM) { if(t==RC_PSEUDODRAGON||t==RC_FIREDRAGON||t==RC_DRAGON||t==RC_WYRM) {
u->irace = t; u->irace = t;

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

@ -1,6 +1,6 @@
/* vi: set ts=2: /* 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 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.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) { while (next) {
direction_t dir = reldirection(current, next); direction_t dir = reldirection(current, next);
border * b = get_borders(current, next); border * b = get_borders(current, next);
while (b) { while (b) {
if (b->type==&bt_wisps) { if (b->type==&bt_wisps) {
region * rl = rconnect(current, (direction_t)((dir+MAXDIRECTIONS-1)%MAXDIRECTIONS)); 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; else if (j==2 && rr && landregion(rterrain(rr))==landregion(rterrain(next))) next = rr;
break; break;
} }
if (b->type->move) b->type->move(b, u, current, next);
b = b->next; b = b->next;
} }
if (current!=next) { /* !pause */ if (current!=next) { /* !pause */

9
src/common/kernel/unit.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2: /* 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 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.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 (u->region == r) return;
if (!ulist) ulist = (&r->units); if (!ulist) ulist = (&r->units);
if (u->region) { 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); setguard(u, GUARD_NONE);
fset(u, FL_MOVED); fset(u, FL_MOVED);
if (u->ship || u->building) leave(u->region, u); if (u->ship || u->building) leave(u->region, u);