From 9a6d4a174a454f45181eacb51cf79e478026024e Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 20 Aug 2016 19:25:44 +0200 Subject: [PATCH] remove move_on_land argument from move_cmd --- src/move.c | 9 ++++----- src/move.h | 2 +- src/piracy.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/move.c b/src/move.c index fdc2dc64f..09f3c2b3f 100644 --- a/src/move.c +++ b/src/move.c @@ -2267,8 +2267,7 @@ static void travel(unit * u, region_list ** routep) } } -// FIXME: move_on_land argument is unused, kill it -void move_cmd(unit * u, order * ord, bool move_on_land) +void move_cmd(unit * u, order * ord) { region_list *route = NULL; @@ -2392,7 +2391,7 @@ int follow_ship(unit * u, order * ord) init_tokens_str(command); getstrtoken(); /* NACH ausführen */ - move_cmd(u, ord, false); + move_cmd(u, ord); return 1; /* true -> Einheitenliste von vorne durchgehen */ } @@ -2559,13 +2558,13 @@ void movement(void) if (ships) { if (u->ship && ship_owner(u->ship) == u) { init_order(u->thisorder); - move_cmd(u, u->thisorder, false); + move_cmd(u, u->thisorder); } } else { if (!u->ship || ship_owner(u->ship) != u) { init_order(u->thisorder); - move_cmd(u, u->thisorder, false); + move_cmd(u, u->thisorder); } } } diff --git a/src/move.h b/src/move.h index 9c5893629..70dddbb0b 100644 --- a/src/move.h +++ b/src/move.h @@ -74,7 +74,7 @@ extern "C" { bool move_blocked(const struct unit *u, const struct region *src, const struct region *dest); bool can_takeoff(const struct ship * sh, const struct region * from, const struct region * to); - void move_cmd(struct unit * u, struct order * ord, bool move_on_land); + void move_cmd(struct unit * u, struct order * ord); int follow_ship(struct unit * u, struct order * ord); #define SA_HARBOUR 1 diff --git a/src/piracy.c b/src/piracy.c index 7c7597691..1a556f92f 100644 --- a/src/piracy.c +++ b/src/piracy.c @@ -206,7 +206,7 @@ void piracy_cmd(unit * u, order *ord) /* Bewegung ausführen */ init_order(u->thisorder); - move_cmd(u, ord, false); + move_cmd(u, ord); } void age_piracy(region *r) {