From 27f22f36bb7a26375ab5aa540a80e0e063a7e28e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 20 Jun 2010 13:32:03 +0200 Subject: [PATCH] Remove radmapnopr(), use radmapupd() instead --- include/prototypes.h | 1 - src/lib/commands/navi.c | 10 +++++----- src/lib/subs/radmap.c | 6 ------ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/include/prototypes.h b/include/prototypes.h index e147f20c6..84614d081 100644 --- 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 void radmapnopr(int, int, int, int, double); 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 bf7eb82e9..c59a16ba5 100644 --- 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) { - 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]; diff --git a/src/lib/subs/radmap.c b/src/lib/subs/radmap.c index f59b6ed0b..82aee6eee 100644 --- 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); } -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) { -- 2.43.0