License upgrade to GPL version 3 or later

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

diff --git a/src/lib/commands/miss.c b/src/lib/commands/miss.c
index a1243860d487005337064531bdb43b58f8faa2f6..970f8c4ce09e58bf5bb0542d2968f4822a693a80 100644 (file)
--- a/src/lib/commands/miss.c
+++ b/src/lib/commands/miss.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -30,7 +29,7 @@
  *  Known contributors to this file:
  *     Thomas Ruschak, 1992
  *     Steve McClure, 2000
- *     Markus Armbruster, 2005-2008
+ *     Markus Armbruster, 2005-2009
  */
 
 #include <config.h>
@@ -64,7 +63,7 @@ mission(void)
 
     p = getstarg(player->argp[1], "Ship, plane or land unit (p,sh,la)? ",
                 buf);
-    if (p == 0)
+    if (!p)
        return RET_SYN;
     type = ef_byname_from(p, ef_with_missions);
     if (type < 0) {
@@ -77,7 +76,7 @@ mission(void)
     p = getstarg(player->argp[3],
                 "Mission (int, sup, osup, dsup, esc, res, air, query, clear)? ",
                 buf);
-    if (p == 0)
+    if (!p)
        return RET_SYN;
 
 /*
@@ -149,8 +148,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 != '.') {
@@ -246,6 +245,12 @@ mission(void)
            }
        }
 
+       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;
+       }
+
        if (*p == '.') {
            x = gp->x;
            y = gp->y;
@@ -306,7 +311,7 @@ show_mission(struct nstr_item *np)
            first = 0;
        }
        pr("%-25s", obj_nameof(gp));
-       prxy(" %3d,%-3d", gp->x, gp->y, player->cnum);
+       prxy(" %3d,%-3d", gp->x, gp->y);
        switch (gp->mission) {
        case MI_INTERDICT:
        case MI_SUPPORT:
@@ -315,7 +320,7 @@ show_mission(struct nstr_item *np)
        case MI_AIR_DEFENSE:
        case MI_DSUPPORT:
        case MI_OSUPPORT:
-           prxy(" %3d,%-3d", gp->opx, gp->opy, player->cnum);
+           prxy(" %3d,%-3d", gp->opx, gp->opy);
            pr("  %4d", gp->radius);
            break;
        default: