From 07d2c38a7342ccafe568321ff8fa4709cc6fbb61 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 31 May 2008 10:35:47 +0200 Subject: [PATCH] Fix ground combat to report defending land units Commit 092a52f2 (v4.3.4) removed the code to estimate defense, because the use of the estimate had been disabled since v4.0.0. This accidentally removed the reporting of defending units, because get_dlist() reported them when called for an estimate, and not when called for real. Fix by removing the unused estimate capability from get_dlist(). It now reports defending units always. (cherry picked from commit 64f44e99044a8b28b8631a27fc882a959f737f84) --- src/lib/subs/attsub.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c index d3d6c5c3..75e86e3c 100644 --- a/src/lib/subs/attsub.c +++ b/src/lib/subs/attsub.c @@ -1230,11 +1230,8 @@ get_dlist(struct combat *def, struct emp_qelem *list, int a_spy, continue; if (def->type == EF_LAND && land.lnd_land != def->lnd_uid) continue; - if (!list) { /* Just estimating the enemy strength */ - intelligence_report(player->cnum, &land, a_spy, - "Scouts report defending unit:"); - continue; - } + intelligence_report(player->cnum, &land, a_spy, + "Scouts report defending unit:"); if (!(llp = malloc(sizeof(struct ulist)))) { logerror("Malloc failed in attack!\n"); abort_attack();