From 39d197b34048fa7e4c70b1bc5836ef5a461e3884 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 29 Sep 2023 06:30:04 +0300 Subject: [PATCH 44/44] Remove utype_move_rate() assert against ownerless units See osdn #48753 Signed-off-by: Marko Lindqvist --- common/movement.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/common/movement.c b/common/movement.c index d7b2c3be00..529578cfb3 100644 --- a/common/movement.c +++ b/common/movement.c @@ -42,7 +42,7 @@ the penalty for reduced hitpoints, the active effects, and any veteran bonuses. - 'utype' and 'pplayer' must be set. 'ptile' can be NULL. + 'utype' must be set. 'pplayer' and 'ptile' can be nullptrs. ****************************************************************************/ int utype_move_rate(const struct unit_type *utype, const struct tile *ptile, const struct player *pplayer, int veteran_level, @@ -53,10 +53,9 @@ int utype_move_rate(const struct unit_type *utype, const struct tile *ptile, int base_move_rate, move_rate; int min_speed; - fc_assert_ret_val(NULL != utype, 0); - fc_assert_ret_val(NULL != pplayer, 0); + fc_assert_ret_val(utype != nullptr, 0); vlevel = utype_veteran_level(utype, veteran_level); - fc_assert_ret_val(NULL != vlevel, 0); + fc_assert_ret_val(vlevel != nullptr, 0); uclass = utype_class(utype); base_move_rate = utype->move_rate + vlevel->move_bonus; @@ -69,7 +68,7 @@ int utype_move_rate(const struct unit_type *utype, const struct tile *ptile, /* Add on effects bonus (Magellan's Expedition, Lighthouse, * Nuclear Power). */ - move_rate += (get_unittype_bonus(pplayer, ptile, utype, NULL, + move_rate += (get_unittype_bonus(pplayer, ptile, utype, nullptr, EFT_MOVE_BONUS) * SINGLE_MOVE); -- 2.40.1