From c2c94b86b4e3bfd16c04ab0925d5e645fcc4dde0 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 18 Jan 2023 01:39:54 +0200 Subject: [PATCH 36/36] kill_unit(): Fix pointer assignment to a boolean See osdn #46472 Signed-off-by: Marko Lindqvist --- server/unittools.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/server/unittools.c b/server/unittools.c index 0928cca412..8f9805bd3a 100644 --- a/server/unittools.c +++ b/server/unittools.c @@ -2476,11 +2476,12 @@ void kill_unit(struct unit *pkiller, struct unit *punit, bool vet) } adjc_iterate_end; if (dsttile != NULL) { - escaped = action_auto_perf_unit_do(AAPC_UNIT_STACK_DEATH, - vunit, tile_owner(dsttile), - NULL, NULL, dsttile, - tile_city(dsttile), - NULL, NULL); + escaped = (action_auto_perf_unit_do(AAPC_UNIT_STACK_DEATH, + vunit, tile_owner(dsttile), + NULL, NULL, dsttile, + tile_city(dsttile), + NULL, NULL) + != NULL); if (escaped) { num_escaped[player_index(vplayer)]++; -- 2.39.0