From de2fae0ee62e5d64de741c07820f1617a1c06189 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 10 Oct 2009 18:15:22 -0400 Subject: [PATCH] Fix defense value of intercepted missiles and satellites Use the plane's defense value, not the plane type's base value. --- src/lib/commands/laun.c | 3 +-- src/lib/subs/mslsub.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/commands/laun.c b/src/lib/commands/laun.c index 11c1b88c..b85a745a 100644 --- a/src/lib/commands/laun.c +++ b/src/lib/commands/laun.c @@ -313,7 +313,6 @@ launch_missile(struct plnstr *pp, int sublaunch) static int launch_sat(struct plnstr *pp) { - struct plchrstr *pcp = plchr + pp->pln_type; coord sx, sy; int i; int dist; @@ -361,7 +360,7 @@ launch_sat(struct plnstr *pp) pr("Your trajectory was a little off.\n"); } nreport(player->cnum, N_LAUNCH, 0, 1); - if (msl_intercept(sx, sy, pp->pln_own, pcp->pl_def, 0, P_O, 0)) { + if (msl_intercept(sx, sy, pp->pln_own, pln_def(pp), 0, P_O, 0)) { return RET_OK; } pp->pln_x = sx; diff --git a/src/lib/subs/mslsub.c b/src/lib/subs/mslsub.c index 8e48692e..f526b38f 100644 --- a/src/lib/subs/mslsub.c +++ b/src/lib/subs/mslsub.c @@ -122,13 +122,13 @@ msl_hit(struct plnstr *pp, int hardtarget, int type, int news_item, xyas(x, y, victim)); if ((pcp->pl_flags & P_T && !(pcp->pl_flags & P_MAR))) { - if (msl_intercept(x, y, pp->pln_own, pcp->pl_def, + if (msl_intercept(x, y, pp->pln_own, pln_def(pp), sublaunch, P_N, P_O)) { return 0; } } if (pcp->pl_flags & P_MAR) { - if (shp_missile_defense(x, y, pp->pln_own, pcp->pl_def)) { + if (shp_missile_defense(x, y, pp->pln_own, pln_def(pp))) { return 0; } }