Update copyright notice

[empserver] / src / lib / subs / mslsub.c

diff --git a/src/lib/subs/mslsub.c b/src/lib/subs/mslsub.c
index 471f6498b4a1d6d47230378bc4dded044e9bc284..f5decdd09a177b2087a184687b335d3272c2e458 100644 (file)
--- a/src/lib/subs/mslsub.c
+++ b/src/lib/subs/mslsub.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@
  *  ---
  *
  *  mslsub.c: Missile subroutine stuff
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1996-2000
@@ -34,32 +34,34 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "queue.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
-#include "optlist.h"
-#include "plane.h"
+#include <stdlib.h>
+#include "file.h"
 #include "land.h"
+#include "misc.h"
+#include "mission.h"
+#include "nat.h"
 #include "news.h"
-#include "xy.h"
 #include "nsc.h"
-#include "file.h"
-#include "nat.h"
+#include "nuke.h"
+#include "optlist.h"
 #include "path.h"
-#include "mission.h"
+#include "plane.h"
+#include "player.h"
 #include "prototypes.h"
+#include "queue.h"
+#include "sect.h"
+#include "ship.h"
+#include "xy.h"
 
 int
-msl_equip(struct plnstr *pp)
+msl_equip(struct plnstr *pp, char mission)
 {
     struct plist pl;
 
     memset(&pl, 0, sizeof(struct plist));
     pl.pcp = plchr + pp->pln_type;
     pl.plane = *pp;
-    return mission_pln_equip(&pl, 0, 0, 'p');
+    return mission_pln_equip(&pl, 0, 0, mission);
 }
 
 int
@@ -115,7 +117,7 @@ msl_hit(struct plnstr *pp, int hardtarget, int type, int news_item,
                    pr("Explosion damages %s %d%%",
                       xyas(pp->pln_x, pp->pln_y, pp->pln_own), dam);
                    getsect(pp->pln_x, pp->pln_y, &sect);
-                   sectdamage(&sect, dam, 0);
+                   sectdamage(&sect, dam);
                    putsect(&sect);
                }
            }
@@ -123,10 +125,15 @@ msl_hit(struct plnstr *pp, int hardtarget, int type, int news_item,
        return 0;
     }
 
+    CANT_HAPPEN(pp->pln_flags & PLN_LAUNCHED);
+    pp->pln_flags |= PLN_LAUNCHED;
+    putplane(pp->pln_uid, pp);
     mpr(pp->pln_own, "\tSHWOOOOOSH!  Missile launched!\n");
 
-    if (pp->pln_nuketype != -1)
+    if (nuk_on_plane(pp) >= 0) {
        mpr(pp->pln_own, "\tArming nuclear warheads...\n");
+       hitchance = 100;
+    }
 
     if (pcp->pl_flags & P_T)
        mpr(victim, "Incoming %s missile sighted at %s...\n",
@@ -146,9 +153,6 @@ msl_hit(struct plnstr *pp, int hardtarget, int type, int news_item,
        }
     }
 
-    if (pp->pln_nuketype != -1)
-       hitchance = 100;
-
     mpr(pp->pln_own, "\t%d%% hitchance...", hitchance);
     hit = (roll(100) <= hitchance);
 
@@ -190,6 +194,9 @@ msl_sel(struct emp_qelem *list, coord x, coord y, natid victim,
            continue;
        if (mission && plane.pln_mission != mission)
            continue;
+       if (mission &&
+           plane.pln_radius < mapdist(x, y, plane.pln_opx, plane.pln_opy))
+           continue;
        if (getrel(getnatp(plane.pln_own), victim) >= NEUTRAL)
            continue;
        /* missiles go one way, so we can use all the range */
@@ -199,6 +206,8 @@ msl_sel(struct emp_qelem *list, coord x, coord y, natid victim,
            continue;
        if (plane.pln_effic < 100)
            continue;
+       if (!pln_airbase_ok(&plane, 1, 0))
+           continue;
        /* got a valid interceptor */
        irv = malloc(sizeof(*irv));
        irv->bombs = 0;
@@ -235,11 +244,9 @@ msl_intercept(coord x, coord y, natid bombown, int hardtarget,
        att_name = "satellite";
        def_name = "a-sat missile";
        news_item = N_SAT_KILL;
-       if (sect.sct_own) {
-           mpr(sect.sct_own, "%s has positioned a satellite over %s\n",
-               sublaunch ? "someone" : cname(bombown),
-               xyas(x, y, sect.sct_own));
-       }
+       mpr(sect.sct_own, "%s has positioned a satellite over %s\n",
+           sublaunch ? "someone" : cname(bombown),
+           xyas(x, y, sect.sct_own));
     } else if (wantflags == P_N && nowantflags == P_O) {
        att_name = "warhead";
        def_name = "abm";
@@ -303,8 +310,7 @@ msl_intercept(coord x, coord y, natid bombown, int hardtarget,
        free(qp);
     }
     if (icount == 0) {
-       if (sect.sct_own != 0)
-           mpr(sect.sct_own, "No %ss launched to intercept.\n", def_name);
+       mpr(sect.sct_own, "No %ss launched to intercept.\n", def_name);
        return destroyed;
     }
 
@@ -322,10 +328,9 @@ msl_intercept(coord x, coord y, natid bombown, int hardtarget,
            mpr(sect.sct_own, "%s launched to intercept %s %s!\n",
                def_name, who, att_name);
        } else {
-           if (sect.sct_own)
-               mpr(sect.sct_own,
-                   "%s launched an %s to intercept the %s %s!\n",
-                   cname(pp->pln_own), def_name, who, att_name);
+           mpr(sect.sct_own,
+               "%s launched an %s to intercept the %s %s!\n",
+               cname(pp->pln_own), def_name, who, att_name);
            mpr(pp->pln_own,
                "%s launched to intercept %s %s arcing towards %s territory!\n",
                def_name, who, att_name, cname(sect.sct_own));
@@ -334,17 +339,15 @@ msl_intercept(coord x, coord y, natid bombown, int hardtarget,
        if (!destroyed &&
            msl_hit(pp, hardtarget, EF_PLANE, news_item, news_item,
                    att_name, x, y, bombown)) {
-           mpr(bombown, "%s destroyed by %s %s!\n", att_name,
-               cname(pp->pln_own), def_name);
-           if (sect.sct_own)
-               mpr(sect.sct_own, "%s %s intercepted!\n", who, att_name);
+           mpr(bombown, "%s destroyed by %s %s!\n",
+               att_name, cname(pp->pln_own), def_name);
+           mpr(sect.sct_own, "%s %s intercepted!\n", who, att_name);
            if (sect.sct_own != pp->pln_own)
                mpr(pp->pln_own, "%s %s intercepted!\n", who, att_name);
            destroyed = 1;
        }
        /* zap the missile */
-       makelost(EF_PLANE, pp->pln_own, pp->pln_uid, pp->pln_x, pp->pln_y);
-       pp->pln_own = 0;
+       pp->pln_effic = 0;
        putplane(pp->pln_uid, pp);
        emp_remque(qp);
        free(qp);
@@ -360,11 +363,10 @@ msl_intercept(coord x, coord y, natid bombown, int hardtarget,
     if (destroyed)
        return destroyed;
     if (icount) {
-       mpr(bombown, "%s made it through %s defenses!\n", att_name,
-           def_name);
-       if (sect.sct_own)
-           mpr(sect.sct_own, "%s made it through %s defenses!\n",
-               att_name, def_name);
+       mpr(bombown, "%s made it through %s defenses!\n",
+           att_name, def_name);
+       mpr(sect.sct_own, "%s made it through %s defenses!\n",
+           att_name, def_name);
     }
     return destroyed;
 }
@@ -409,14 +411,19 @@ msl_launch_mindam(struct emp_qelem *list, coord x, coord y, int hardtarget,
                        dam += nukedam;
                } else
                    dam += newdam;
+#if 0
+           /*
+            * FIXME want collateral damage on miss (which can't
+            * happen for nuclear war heads), but we get here too when
+            * launch fails or missile is intercepted
+            */
            } else {
                /* Missiles that miss have to hit somewhere! */
                newdam = pln_damage(&plp->plane, x, y, 'p', &nukedam, 0);
-               collateral_damage(x, y, newdam, 0);
+               collateral_damage(x, y, newdam);
+#endif
            }
-           makelost(EF_PLANE, plp->plane.pln_own, plp->plane.pln_uid,
-                    plp->plane.pln_x, plp->plane.pln_y);
-           plp->plane.pln_own = 0;
+           plp->plane.pln_effic = 0;
            putplane(plp->plane.pln_uid, &plp->plane);
            emp_remque(qp);
            free(qp);