From ded3ca41efd041a7e91a86c766d5146ca0a080c3 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 15 Jun 2006 18:58:47 +0000 Subject: [PATCH] (lnd_hit_mine): Remove silly use of double. Rounds fractional damage to engineers down instead of up. (retreat_land1): Failed to reduce mine damage to engineers. --- src/lib/subs/lndsub.c | 9 ++++----- src/lib/subs/retreat.c | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c index afcd5fc4..c430f54b 100644 --- a/src/lib/subs/lndsub.c +++ b/src/lib/subs/lndsub.c @@ -976,7 +976,7 @@ lnd_hardtarget(struct lndstr *lp) static int lnd_hit_mine(struct lndstr *lp, struct lchrstr *lcp) { - double m; + int m; mpr(lp->lnd_own, "Blammo! Landmines detected in %s! ", xyas(lp->lnd_x, lp->lnd_y, lp->lnd_own)); @@ -985,11 +985,10 @@ lnd_hit_mine(struct lndstr *lp, struct lchrstr *lcp) m = MINE_LDAMAGE(); if (lcp->l_flags & L_ENGINEER) - m /= 2.0; + m /= 2; - landdamage(lp, ldround(m, 1)); - - return (int)m; + landdamage(lp, m); + return m; } double diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c index cbfdecc1..a0625c7a 100644 --- a/src/lib/subs/retreat.c +++ b/src/lib/subs/retreat.c @@ -500,6 +500,8 @@ retreat_land1(struct lndstr *lp, char code, int orig) xyas(newx, newy, lp->lnd_own)); nreport(lp->lnd_own, N_LHIT_MINE, 0, 1); m = MINE_LDAMAGE(); + if (lcp->l_flags & L_ENGINEER) + m /= 2; landdamage(lp, m); mines--; sect.sct_mines = mines;