Update copyright notice

[empserver] / src / lib / commands / miss.c

diff --git a/src/lib/commands/miss.c b/src/lib/commands/miss.c
index acd24b4e709093390f2fe7df831aae13dfd3d186..7140ae2610ca35e9ed539ca478e245d1baa8941c 100644 (file)
--- a/src/lib/commands/miss.c
+++ b/src/lib/commands/miss.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -30,6 +30,7 @@
  *  Known contributors to this file:
  *     Thomas Ruschak, 1992
  *     Steve McClure, 2000
+ *     Markus Armbruster, 2005-2009
  */
 
 #include <config.h>
@@ -54,16 +55,16 @@ mission(void)
     int type;
     int mission;
     coord x, y;
-    int desired_radius, radius;
+    int radius, range;
     union empobj_storage item;
     struct empobj *gp;
-    int num = 0, mobmax, mobused;
+    int num = 0;
     struct nstr_item ni;
     char buf[1024];
 
-    if ((p =
-        getstarg(player->argp[1], "Ship, plane or land unit (p,sh,la)? ",
-                 buf)) == 0)
+    p = getstarg(player->argp[1], "Ship, plane or land unit (p,sh,la)? ",
+                buf);
+    if (!p)
        return RET_SYN;
     type = ef_byname_from(p, ef_with_missions);
     if (type < 0) {
@@ -73,10 +74,10 @@ mission(void)
     if (!snxtitem(&ni, type, player->argp[2], NULL))
        return RET_SYN;
 
-    if ((p =
-        getstarg(player->argp[3],
-                 "Mission (int, sup, osup, dsup, esc, res, air, query, clear)? ",
-                 buf)) == 0)
+    p = getstarg(player->argp[3],
+                "Mission (int, sup, osup, dsup, esc, res, air, query, clear)? ",
+                buf);
+    if (!p)
        return RET_SYN;
 
 /*
@@ -148,8 +149,8 @@ mission(void)
        return RET_FAIL;
     }
 
-    if ((p = getstarg(player->argp[4], "operations point? ", buf)) == 0
-       || *p == 0)
+    p = getstarg(player->argp[4], "operations point? ", buf);
+    if (!p || !*p)
        return RET_SYN;
 
     if (*p != '.') {
@@ -158,19 +159,13 @@ mission(void)
     }
 
     if (player->argp[5] != NULL) {
-       desired_radius = atoi(player->argp[5]);
-       if (desired_radius < 0) {
-           pr("Radius must be greater than zero!\n");
+       radius = atoi(player->argp[5]);
+       if (radius < 0) {
+           pr("Radius can't be negative!\n");
            return RET_FAIL;
        }
-    } else {
-       desired_radius = 9999;
-    }
-
-    if ((mobmax = get_empobj_mob_max(type)) == -1)
-       return RET_FAIL;
-
-    mobused = ldround(mission_mob_cost * (double)mobmax, 1);
+    } else
+       radius = 9999;
 
     while (nxtitem(&ni, &item)) {
        gp = (struct empobj *)&item;
@@ -178,31 +173,18 @@ mission(void)
        if (!player->owner || gp->own == 0)
            continue;
 
-       if (gp->mobil < mobused && mission_mob_cost) {
-           pr("%s: not enough mobility! (needs %d)\n",
-              obj_nameof(gp), mobused);
-           continue;
-       }
-       if (mission == MI_RESERVE && !lnd_can_attack((struct lndstr *)gp)) {
-           pr("%s is not designed to fight ground troops\n",
-              obj_nameof(gp));
-           continue;
-       }
-       if (*p == '.') {
-           x = gp->x;
-           y = gp->y;
-       }
-
-       radius = oprange(gp, mission);
-       if (radius < mapdist(gp->x, gp->y, x, y)) {
-           pr("%s: out of range! (range %d)\n",
-              obj_nameof(gp), radius);
-           continue;
+       if (mission == MI_RESERVE) {
+           if (!lnd_can_attack((struct lndstr *)gp)) {
+               pr("%s is not designed to fight ground troops\n",
+                  obj_nameof(gp));
+               continue;
+           }
+           if (!lchr[gp->type].l_rad) {
+               pr("%s cannot react anywhere!\n", obj_nameof(gp));
+               continue;
+           }
        }
 
-       if (radius > desired_radius)
-           radius = desired_radius;
-
        if ((mission == MI_INTERDICT) && (type == EF_SHIP))
            if (mchr[(int)gp->type].m_glim == 0) {
                pr("%s: cannot fire at range!\n", obj_nameof(gp));
@@ -264,18 +246,33 @@ mission(void)
            }
        }
 
-       num++;                  /* good one.. go with it */
+       if (type == EF_PLANE && nuk_on_plane((struct plnstr *)gp) >= 0) {
+           pr("%s can't perform a mission while it carries a nuclear weapon",
+              obj_nameof(gp));
+           continue;
+       }
 
-       pr("%s on %s mission, centered on %s, radius %d\n",
-          obj_nameof(gp), mission_name(mission),
-          xyas(x, y, player->cnum), radius);
-       gp->mobil -= mobused;
+       if (*p == '.') {
+           x = gp->x;
+           y = gp->y;
+       }
 
        gp->mission = mission;
+       range = oprange(gp);
+       if (range < mapdist(gp->x, gp->y, x, y)) {
+           pr("%s: out of range! (range %d)\n",
+              obj_nameof(gp), range);
+           continue;
+       }
        gp->opx = x;
        gp->opy = y;
-       gp->radius = radius;
+       gp->radius = MIN(range, radius);
        put_empobj(type, gp->uid, gp);
+       num++;
+
+       pr("%s on %s mission, centered on %s, radius %d\n",
+          obj_nameof(gp), mission_name(mission),
+          xyas(x, y, player->cnum), gp->radius);
     }
     if (num == 0) {
        pr("No %s%s\n", ef_nameof(type), splur(num));