(radar): New, moved functionality from rada() except ef_type determination.

(rada): Call radar() with EF_SHIP.
(lrad): New, call radar() with EF_LAND.
(empmod[]): Call lrad() for lradar command.
(march, navi): Call radar() with appropriate type.

diff --git a/include/prototypes.h b/include/prototypes.h
index 8afa40a90be66cba639c3fdef1ff720ce14396e3..0060d462fbea45b3ad5177f33f2837946707fa32 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -73,6 +73,7 @@ extern char *prsub(struct shpstr *);
 extern int check_trade(void);
 extern int ontradingblock(int, void *);
 extern void trdswitchown(int, void *, int);
+extern int radar(short);
 /* Commands */
 int acce(void);
 int add(void);
@@ -145,6 +146,7 @@ int llook(void);
 int load(void);
 int look(void);
 int lost(void);
+int lrad(void);
 int lrange(void);
 int lretr(void);
 int lsta(void);

diff --git a/src/lib/commands/marc.c b/src/lib/commands/marc.c
index 87f6cb62166a51b5be55aef230bcf03b4ab2dbab..f430d0c9656264148f06536d0b5dc4773ffad00c 100644 (file)
--- a/src/lib/commands/marc.c
+++ b/src/lib/commands/marc.c
@@ -156,7 +156,7 @@ march(void)
            break;
        case 'r':
            player->argp[0] = "lradar";
-           rada();
+           radar(EF_LAND);
            skip = 1;
            player->btused++;
            break;

diff --git a/src/lib/commands/navi.c b/src/lib/commands/navi.c
index f74b30c914aefc081dc4e6f17f4e08a4ec723d63..c76c3810f280f5b25888213695129cf0619290f5 100644 (file)
--- a/src/lib/commands/navi.c
+++ b/src/lib/commands/navi.c
@@ -179,7 +179,7 @@ navi(void)
            stopping |= shp_sweep(&ship_list, 1, 0, player->cnum);
            break;
        case 'r':
-           rada();
+           radar(EF_SHIP);
            skip = 1;
            player->btused++;
            break;

diff --git a/src/lib/commands/rada.c b/src/lib/commands/rada.c
index 73d4dbb6e998a9aa42072f0196ae081eeaca7fb0..fa94b2c6e559ff52e9b4a85a2c500b356f438364 100644 (file)
--- a/src/lib/commands/rada.c
+++ b/src/lib/commands/rada.c
@@ -38,8 +38,18 @@
 #include "optlist.h"
 #include "empobj.h"
 
+int rada(void)
+{
+    return radar(EF_SHIP);
+}
+
+int lrad(void)
+{
+    return radar(EF_LAND);
+}
+
 int
-rada(void)
+radar(short type)
 {
     char *cp;
     double tf;
@@ -48,11 +58,8 @@ rada(void)
     struct nstr_sect ns;
     union empobj_storage item;
     char buf[1024];
-    short type;
     char prompt[80];
 
-    type = player->argp[0][0] == 'l' ? EF_LAND : EF_SHIP;
-
     sprintf(prompt, "Radar from (%s # or sector(s)) : ", ef_nameof(type));
     cp = getstarg(player->argp[1], prompt, buf);
                      

diff --git a/src/lib/player/empmod.c b/src/lib/player/empmod.c
index e3676b72a3bf5016c688eabbcab8438dfc21f578..419d3e2891fa897f4882f950a0c0997b3354e716 100644 (file)
--- a/src/lib/player/empmod.c
+++ b/src/lib/player/empmod.c
@@ -142,7 +142,7 @@ struct cmndstr player_coms[] = {
      1, load, C_MOD, NORM + CAP},
     {"lookout <SHIPS>", 1, look, 0, NORM + CAP},
     {"lost", 0, lost, 0, NORM},
-    {"lradar <UNITS | SECTS>", 1, rada, 0, NORM + CAP},
+    {"lradar <UNITS | SECTS>", 1, lrad, 0, NORM + CAP},
     {"lrange <UNITS> <range>", 1, lrange, C_MOD, NORM + CAP},
     {"lretreat <UNITS|ARMY> <PATH> [i|h|b|c]",
      1, lretr, C_MOD, NORM + CAP},