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

remove move_on_land argument from move_cmd

This commit is contained in:
Enno Rehling 2016-08-20 19:25:44 +02:00
parent 6c17cf9d17
commit 9a6d4a174a
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/move.c
View File

@ -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)
void move_cmd(unit * u, order * ord, bool move_on_land)
{ {
region_list *route = NULL; region_list *route = NULL;
@ -2392,7 +2391,7 @@ int follow_ship(unit * u, order * ord)
init_tokens_str(command); init_tokens_str(command);
getstrtoken(); getstrtoken();
/* NACH ausführen */ /* NACH ausführen */
move_cmd(u, ord, false); move_cmd(u, ord);
return 1; /* true -> Einheitenliste von vorne durchgehen */ return 1; /* true -> Einheitenliste von vorne durchgehen */
} }
@ -2559,13 +2558,13 @@ void movement(void)
if (ships) { if (ships) {
if (u->ship && ship_owner(u->ship) == u) { if (u->ship && ship_owner(u->ship) == u) {
init_order(u->thisorder); init_order(u->thisorder);
move_cmd(u, u->thisorder, false); move_cmd(u, u->thisorder);
} }
} }
else { else {
if (!u->ship || ship_owner(u->ship) != u) { if (!u->ship || ship_owner(u->ship) != u) {
init_order(u->thisorder); init_order(u->thisorder);
move_cmd(u, u->thisorder, false); move_cmd(u, u->thisorder);
} }
} }
} }

2
src/move.h
View File

@ -74,7 +74,7 @@ extern "C" {
bool move_blocked(const struct unit *u, const struct region *src, bool move_blocked(const struct unit *u, const struct region *src,
const struct region *dest); const struct region *dest);
bool can_takeoff(const struct ship * sh, const struct region * from, const struct region * to); 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); int follow_ship(struct unit * u, struct order * ord);
#define SA_HARBOUR 1 #define SA_HARBOUR 1

2
src/piracy.c
View File

@ -206,7 +206,7 @@ void piracy_cmd(unit * u, order *ord)
/* Bewegung ausführen */ /* Bewegung ausführen */
init_order(u->thisorder); init_order(u->thisorder);
move_cmd(u, ord, false); move_cmd(u, ord);
} }
void age_piracy(region *r) { void age_piracy(region *r) {