From ed1515d2025ee9faabded8ff6a2ebe2b91717e5a Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 13 Feb 2023 18:58:55 +0200 Subject: [PATCH 20/20] 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 694822c054..db1e5d3b2e 100644 --- a/common/movement.c +++ b/common/movement.c @@ -684,7 +684,7 @@ unit_move_to_tile_test(const struct unit *punit, } /**************************************************************************** - 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. @@ -704,7 +704,7 @@ enum unit_move_result unit_teleport_to_tile_test(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 99d7e716e7..0346071190 100644 --- a/common/movement.h +++ b/common/movement.h @@ -114,7 +114,6 @@ unit_teleport_to_tile_test(const struct unit *punit, 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 d95fb91e22..a6fc5486fe 100644 --- a/server/scripting/api_server_edit.c +++ b/server/scripting/api_server_edit.c @@ -170,8 +170,8 @@ bool api_edit_unit_teleport(lua_State *L, Unit *punit, Tile *dest) LUASCRIPT_CHECK_ARG_NIL(L, dest, 3, Tile, FALSE); if (unit_teleport_to_tile_test(punit, ACTIVITY_IDLE, - unit_tile(punit), dest, TRUE, - FALSE, NULL, TRUE) != MR_OK) { + unit_tile(punit), dest, FALSE, + NULL, TRUE) != MR_OK) { /* Can't teleport to target. Return that unit is still alive. */ return TRUE; } -- 2.39.1