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

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

diff --git a/src/lib/commands/rada.c b/src/lib/commands/rada.c
index b8f552502a6c374d5e539debac2301b5e339e2c2..d21bbebb12e4cc91ba02d71e7fe60a9c9f8559c8 100644 (file)
--- a/src/lib/commands/rada.c
+++ b/src/lib/commands/rada.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, 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/>.
  *
  *  ---
  *
@@ -26,7 +25,7 @@
  *  ---
  *
  *  rada.c: Do radar from a ship/unit/sector
- * 
+ *
  *  Known contributors to this file:
  *     Ron Koenderink, 2006
  */
@@ -35,7 +34,7 @@
 
 #include "commands.h"
 #include "optlist.h"
-#include "empobj.h"
+#include "unit.h"
 
 int
 rada(void)
@@ -50,11 +49,12 @@ lrad(void)
 }
 
 int
-radar(short type)
+radar(int type)
 {
     char *cp;
     double tf;
-    double tech;
+    double tlev;
+    int spy;
     struct nstr_item ni;
     struct nstr_sect ns;
     union empobj_storage item;
@@ -66,34 +66,28 @@ radar(short type)
 
     sprintf(prompt, "Radar from (%s # or sector(s)) : ", ef_nameof(type));
     cp = getstarg(player->argp[1], prompt, buf);
-                     
-    if (cp == 0)
+
+    if (!cp)
        return RET_SYN;
     switch (sarg_type(cp)) {
     case NS_AREA:
        if (!snxtsct(&ns, cp))
            return RET_SYN;
-       tech = tfact(player->cnum, 8.0);
-       if (tech > WORLD_Y / 4.0)
-           tech = WORLD_Y / 4.0;
-       if (tech > WORLD_X / 8.0)
-           tech = WORLD_X / 8.0;
+       tlev = getnatp(player->cnum)->nat_level[NAT_TLEV];
        while (nxtsct(&ns, &item.sect)) {
            if (item.sect.sct_type != SCT_RADAR)
                continue;
            if (!player->owner)
                continue;
            radmap(item.sect.sct_x, item.sect.sct_y, item.sect.sct_effic,
-                  (int)(tech * 2.0), 0.0);
+                  tlev, 16, 0.0);
        }
        break;
     case NS_LIST:
     case NS_GROUP:
        /* assumes a NS_LIST return is a unit no */
-       if (!snxtitem(&ni, type, cp)) {
-           pr("Specify at least one %s\n", ef_nameof(type));
+       if (!snxtitem(&ni, type, cp, NULL))
            return RET_SYN;
-       }
        while (nxtitem(&ni, &item)) {
            if (!player->owner)
                continue;
@@ -101,8 +95,7 @@ radar(short type)
            if (type == EF_SHIP) {
                if (mchr[(int)item.ship.shp_type].m_flags & M_SONAR)
                    tf = techfact(item.ship.shp_tech, 1.0);
-               tech = techfact(item.ship.shp_tech,
-                   mchr[(int)item.ship.shp_type].m_vrnge);
+               spy = mchr[item.ship.shp_type].m_vrnge;
            } else {
                if (!(lchr[(int)item.land.lnd_type].l_flags & L_RADAR)) {
                    pr("%s can't use radar!\n", prland(&item.land));
@@ -112,17 +105,12 @@ radar(short type)
                    pr("Units on ships can't use radar!\n");
                    continue;
                }
-               tech = techfact(item.land.lnd_tech,
-                               lchr[item.land.lnd_type].l_spy);
+               spy = lchr[item.land.lnd_type].l_spy;
            }
 
-           pr("%s at ", obj_nameof(&item.gen));
-           if (tech > WORLD_Y / 2.0)
-               tech = WORLD_Y / 2.0;
-           if (tech > WORLD_X / 4.0)
-               tech = WORLD_X / 4.0;
+           pr("%s at ", unit_nameof(&item.gen));
            radmap(item.gen.x, item.gen.y, item.gen.effic,
-                  (int)tech, tf);
+                  item.gen.tech, spy, tf);
        }
        break;
     default: