From f81200ec4e11f79d8c39faf90a551478040a134b Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 13 Feb 2023 18:55:23 +0200 Subject: [PATCH 39/39] unit_teleport_to_tile_test(): Drop unused 'igzoc' parameter See osdn #47352 Signed-off-by: Marko Lindqvist --- common/movement.c | 4 ++-- common/movement.h | 1 - server/scripting/api_server_edit.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/common/movement.c b/common/movement.c index 2e6caa7c69..444fb8669c 100644 --- a/common/movement.c +++ b/common/movement.c @@ -734,7 +734,7 @@ unit_move_to_tile_test(const struct civ_map *nmap, } /************************************************************************//** - Returns whether the unit can move from its current tile to the + Returns whether the unit can teleport from its current tile to the destination tile. An enumerated value is returned indication the error or success status. @@ -756,7 +756,7 @@ unit_teleport_to_tile_test(const struct civ_map *nmap, const struct unit *punit, enum unit_activity activity, const struct tile *src_tile, - const struct tile *dst_tile, bool igzoc, + const struct tile *dst_tile, bool enter_transport, struct unit *embark_to, bool enter_enemy_city) { diff --git a/common/movement.h b/common/movement.h index c1bd1fe584..cfe25d9fe0 100644 --- a/common/movement.h +++ b/common/movement.h @@ -129,7 +129,6 @@ unit_teleport_to_tile_test(const struct civ_map *nmap, enum unit_activity activity, const struct tile *src_tile, const struct tile *dst_tile, - bool igzoc, bool enter_transport, struct unit *embark_to, bool enter_enemy_city); bool can_unit_transport(const struct unit *transporter, const struct unit *transported); diff --git a/server/scripting/api_server_edit.c b/server/scripting/api_server_edit.c index 86e47e34a5..6e0e54ca62 100644 --- a/server/scripting/api_server_edit.c +++ b/server/scripting/api_server_edit.c @@ -224,8 +224,8 @@ bool api_edit_unit_teleport(lua_State *L, Unit *punit, Tile *dest, } if (unit_teleport_to_tile_test(&(wld.map), punit, ACTIVITY_IDLE, - unit_tile(punit), dest, TRUE, - FALSE, embark_to, TRUE) != MR_OK) { + unit_tile(punit), dest, FALSE, + embark_to, TRUE) != MR_OK) { /* Can't teleport to target. Return that unit is still alive. */ return TRUE; } -- 2.39.1