Remove radmapnopr(), use radmapupd() instead

diff --git a/include/prototypes.h b/include/prototypes.h
index e147f20c6a498b0e2ccf9fb4cb4a1d0a24ce1759..84614d081a169a4b8b3c699baf2aa7bc6598a680 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -584,7 +584,6 @@ extern int ufindpfx(char *, int);
 extern int deltx(struct range *, coord);
 extern int delty(struct range *, coord);
 extern void radmap(int, int, int, int, double);
 extern int deltx(struct range *, coord);
 extern int delty(struct range *, coord);
 extern void radmap(int, int, int, int, double);

-extern void radmapnopr(int, int, int, int, double);

 extern void radmapupd(int, int, int, int, int, double);
 /* rej.c */
 extern int setrel(natid, natid, int);
 extern void radmapupd(int, int, int, int, int, double);
 /* rej.c */
 extern int setrel(natid, natid, int);

diff --git a/src/lib/commands/navi.c b/src/lib/commands/navi.c
index bf7eb82e9d894a927808482957086d7c7d743b13..c59a16ba5e3ee15820b16bae1032c1840c1acbbd 100644 (file)
--- a/src/lib/commands/navi.c
+++ b/src/lib/commands/navi.c
@@ -157,11 +157,11 @@ do_unit_move(struct emp_qelem *ulist, int *together,
                cp = buf;
        }
        if (type == EF_SHIP) {
                cp = buf;
        }
        if (type == EF_SHIP) {

-           radmapnopr(leader->x, leader->y, (int)leader->effic,
-                      (int)techfact(leader->tech,
-                                    mchr[(int)leader->type].m_vrnge),
-                      (mchr[(int)leader->type].m_flags & M_SONAR)
-                      ? techfact(leader->tech, 1.0) : 0.0);
+           radmapupd(player->cnum, leader->x, leader->y, leader->effic,
+                     (int)techfact(leader->tech,
+                                   mchr[leader->type].m_vrnge),
+                     (mchr[leader->type].m_flags & M_SONAR)
+                     ? techfact(leader->tech, 1.0) : 0.0);

        }
        if (cp == NULL || *cp == '\0')
            cp = &dirch[DIR_STOP];
        }
        if (cp == NULL || *cp == '\0')
            cp = &dirch[DIR_STOP];

diff --git a/src/lib/subs/radmap.c b/src/lib/subs/radmap.c
index f59b6ed0ba3c53bdf419bc2df1c5c08185b6e804..82aee6eee14f56687aa0a946ad67c464c7eb9f36 100644 (file)
--- a/src/lib/subs/radmap.c
+++ b/src/lib/subs/radmap.c
@@ -55,12 +55,6 @@ radmap(int cx, int cy, int eff, int range, double seesub)
     radmap2(player->cnum, cx, cy, eff, range, seesub, 1);
 }
 
     radmap2(player->cnum, cx, cy, eff, range, seesub, 1);
 }
 

-void
-radmapnopr(int cx, int cy, int eff, int range, double seesub)
-{
-    radmap2(player->cnum, cx, cy, eff, range, seesub, 0);
-}
-

 void
 radmapupd(int own, int cx, int cy, int eff, int range, double seesub)
 {
 void
 radmapupd(int own, int cx, int cy, int eff, int range, double seesub)
 {