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

Verbesserungen am Mistelzweig

This commit is contained in:
Enno Rehling 2004-07-03 22:04:32 +00:00
parent 2702b3176d
commit 06ffd492f3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/kernel/battle.c
View File

@ -3083,6 +3083,9 @@ join_battle(battle * b, unit * u, boolean attack)
{ {
fighter *c = NULL; fighter *c = NULL;
fighter *fig; fighter *fig;
attrib * a = a_find(u->attribs, &at_fleechance);
if (a!=NULL) return NULL;
cv_foreach(fig, b->fighters) { cv_foreach(fig, b->fighters) {
if (fig->unit == u) { if (fig->unit == u) {

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

@ -660,6 +660,7 @@ drifting_ships(region * r)
if (rnext->terrain != T_OCEAN && !flying_ship(sh)) { if (rnext->terrain != T_OCEAN && !flying_ship(sh)) {
sh->coast = reldirection(rnext, r); sh->coast = reldirection(rnext, r);
assert(rterrain(r)==T_OCEAN);
} else { } else {
sh->coast = NODIRECTION; sh->coast = NODIRECTION;
} }
@ -1608,6 +1609,7 @@ sail(unit * u, region * next_point, boolean move_on_land)
set_order(&u->thisorder, NULL); set_order(&u->thisorder, NULL);
if (current_point->terrain != T_OCEAN && !is_cursed(sh->attribs, C_SHIP_FLYING, 0)) { if (current_point->terrain != T_OCEAN && !is_cursed(sh->attribs, C_SHIP_FLYING, 0)) {
sh->coast = reldirection(current_point, last_point); sh->coast = reldirection(current_point, last_point);
assert(rterrain(last_point)==T_OCEAN);
} else { } else {
sh->coast = NODIRECTION; sh->coast = NODIRECTION;
} }