Rename obj_nameof() to unit_nameof() and move to unitsub.c

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

diff --git a/src/lib/commands/miss.c b/src/lib/commands/miss.c
index 894ba30847eab42a2085871a035c99b2c4e0c254..93f96bb6b548fb1b0380a3e1872faa6fb4c2b96c 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-2010, 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,16 +29,16 @@
  *  Known contributors to this file:
  *     Thomas Ruschak, 1992
  *     Steve McClure, 2000
- *     Markus Armbruster, 2005-2009
+ *     Markus Armbruster, 2005-2010
  */
 
 #include <config.h>
 
 #include "commands.h"
-#include "empobj.h"
 #include "mission.h"
 #include "optlist.h"
 #include "path.h"
+#include "unit.h"
 
 static int clear_mission(struct nstr_item *);
 static int show_mission(struct nstr_item *);
@@ -176,24 +175,24 @@ mission(void)
        if (mission == MI_RESERVE) {
            if (!lnd_can_attack((struct lndstr *)gp)) {
                pr("%s is not designed to fight ground troops\n",
-                  obj_nameof(gp));
+                  unit_nameof(gp));
                continue;
            }
            if (!lchr[gp->type].l_rad) {
-               pr("%s cannot react anywhere!\n", obj_nameof(gp));
+               pr("%s cannot react anywhere!\n", unit_nameof(gp));
                continue;
            }
        }
 
        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));
+               pr("%s: cannot fire at range!\n", unit_nameof(gp));
                continue;
            }
 
        if ((mission == MI_INTERDICT) && (type == EF_LAND))
            if (lchr[(int)gp->type].l_dam == 0) {
-               pr("%s: cannot fire at range!\n", obj_nameof(gp));
+               pr("%s: cannot fire at range!\n", unit_nameof(gp));
                continue;
            }
 
@@ -248,7 +247,7 @@ 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));
+              unit_nameof(gp));
            continue;
        }
 
@@ -261,7 +260,7 @@ mission(void)
        range = oprange(gp);
        if (range < mapdist(gp->x, gp->y, x, y)) {
            pr("%s: out of range! (range %d)\n",
-              obj_nameof(gp), range);
+              unit_nameof(gp), range);
            continue;
        }
        gp->opx = x;
@@ -271,7 +270,7 @@ mission(void)
        num++;
 
        pr("%s on %s mission, centered on %s, radius %d\n",
-          obj_nameof(gp), mission_name(mission),
+          unit_nameof(gp), mission_name(mission),
           xyas(x, y, player->cnum), gp->radius);
     }
     if (num == 0) {
@@ -311,7 +310,7 @@ show_mission(struct nstr_item *np)
            pr("Thing                         x,y   op-sect rad mission\n");
            first = 0;
        }
-       pr("%-25s", obj_nameof(gp));
+       pr("%-25s", unit_nameof(gp));
        prxy(" %3d,%-3d", gp->x, gp->y);
        switch (gp->mission) {
        case MI_INTERDICT: