From 546ffe87b83ad0ea450bbe567c6b41e6515c68f9 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 10 Jun 2016 18:00:22 +0200 Subject: [PATCH] change ship_allowed constants just a little bit --- src/modules/score.c | 2 +- src/move.c | 2 +- src/move.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/score.c b/src/modules/score.c index 74eb0898b..2fd3cf230 100644 --- a/src/modules/score.c +++ b/src/modules/score.c @@ -167,7 +167,7 @@ void score(void) fprintf(scoreFP, "(%s) ", score); fprintf(scoreFP, "%30.30s (%3.3s) %5s (%3d)\n", f->name, - rc_name_s(f->race, NAME_SINGULAR), + f->race->_name, factionid(f), f->age); } diff --git a/src/move.c b/src/move.c index e602b073c..98ed138fb 100644 --- a/src/move.c +++ b/src/move.c @@ -836,7 +836,7 @@ static void drifting_ships(region * r) region *rn; dir = (direction_t)((d + d_offset) % MAXDIRECTIONS); rn = rconnect(r, dir); - if (rn != NULL && fval(rn->terrain, SAIL_INTO) && check_ship_allowed(sh, rn) > 0) { + if (rn != NULL && fval(rn->terrain, SAIL_INTO) && check_ship_allowed(sh, rn) >= 0) { rnext = rn; if (!fval(rnext->terrain, SEA_REGION)) break; diff --git a/src/move.h b/src/move.h index 0417dcec5..bdb4f61c7 100644 --- a/src/move.h +++ b/src/move.h @@ -77,8 +77,8 @@ extern "C" { void move_cmd(struct unit * u, struct order * ord, bool move_on_land); int follow_ship(struct unit * u, struct order * ord); -#define SA_HARBOUR 2 -#define SA_COAST 1 +#define SA_HARBOUR 1 +#define SA_COAST 0 #define SA_NO_INSECT -1 #define SA_NO_COAST -2