From f3311da168091bc32a45de40ae31a0e8ab1c6c64 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 19 Dec 2004 16:58:55 +0000 Subject: [PATCH] Nachwirkungen ds letzten Commit: - unknowndirection hat falschen parameter - direction_name wird nicht mehr gebraucht --- src/common/kernel/eressea.c | 2 +- src/common/kernel/movement.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c index abd84fe31..b90b51bbb 100644 --- a/src/common/kernel/eressea.c +++ b/src/common/kernel/eressea.c @@ -2934,7 +2934,7 @@ movement_error(unit * u, const char * token, order * ord, int error_code) d = finddirection(token, u->faction->locale); return msg_message("moveblocked", "unit direction", u, d); case E_MOVE_NOREGION: - return msg_feedback(u, ord, "unknowndirection", "direction", token); + return msg_feedback(u, ord, "unknowndirection", "dirname", token); } return NULL; } diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c index 8356f61ac..eeb0c6b55 100644 --- a/src/common/kernel/movement.c +++ b/src/common/kernel/movement.c @@ -1021,19 +1021,6 @@ roadto(const region * r, direction_t dir) return true; } -static const char * -direction_name(const region * from, const region * to, const struct locale * lang) -{ - direction_t dir = reldirection(from, to); - if (dir=0) return locale_string(lang, directions[dir]); - if (dir==D_SPECIAL) { - spec_direction *sd = special_direction(from, to); - return sd->keyword; - } - assert(!"invalid direction"); - return NULL; -} - static region_list * cap_route(region * r, region_list * route, region_list * route_end, int speed) { @@ -1840,7 +1827,6 @@ travel_i(unit * u, region_list * route_begin, region_list * route_end, order * o static void travel(unit * u, region_list ** routep) { - static boolean init = false; region * r = u->region; region_list * route_end; region_list * route_begin = NULL;