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

Nachwirkungen ds letzten Commit: 

- unknowndirection hat falschen parameter
- direction_name wird nicht mehr gebraucht
This commit is contained in:
Enno Rehling 2004-12-19 16:58:55 +00:00
parent 1ead3ebe08
commit f3311da168
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2934,7 +2934,7 @@ movement_error(unit * u, const char * token, order * ord, int error_code)
d = finddirection(token, u->faction->locale); d = finddirection(token, u->faction->locale);
return msg_message("moveblocked", "unit direction", u, d); return msg_message("moveblocked", "unit direction", u, d);
case E_MOVE_NOREGION: case E_MOVE_NOREGION:
return msg_feedback(u, ord, "unknowndirection", "direction", token); return msg_feedback(u, ord, "unknowndirection", "dirname", token);
} }
return NULL; return NULL;
} }

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

@ -1021,19 +1021,6 @@ roadto(const region * r, direction_t dir)
return true; 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<MAXDIRECTIONS && 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 * static region_list *
cap_route(region * r, region_list * route, region_list * route_end, int speed) 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 static void
travel(unit * u, region_list ** routep) travel(unit * u, region_list ** routep)
{ {
static boolean init = false;
region * r = u->region; region * r = u->region;
region_list * route_end; region_list * route_end;
region_list * route_begin = NULL; region_list * route_begin = NULL;