From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 16 Jan 2010 09:14:43 +0000 (+0100)
Subject: Clean up useless getnatp() in conv(), nav_map(), tele()
X-Git-Tag: v4.3.24~10
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=8195d5fb8874ee2c5f5bfe53077a511230ea79eb

Clean up useless getnatp() in conv(), nav_map(), tele()

Spotted by the Clang Static Analyzer.
---

diff --git a/src/lib/commands/conv.c b/src/lib/commands/conv.c
index 363b04004..f71c41087 100644
--- a/src/lib/commands/conv.c
+++ b/src/lib/commands/conv.c
@@ -52,8 +52,6 @@ conv(void)
     struct lndstr land;
     struct nstr_item ni;
 
-
-    natp = getnatp(player->cnum);
     if (!snxtsct(&nstr, player->argp[1]))
 	return RET_SYN;
     uwtoconvert = onearg(player->argp[2], "Number to convert: ");
diff --git a/src/lib/commands/navi.c b/src/lib/commands/navi.c
index d7071ae20..cf297411e 100644
--- a/src/lib/commands/navi.c
+++ b/src/lib/commands/navi.c
@@ -278,7 +278,6 @@ nav_map(int x, int y, int show_designations)
 {
     char *ptr;
     struct nstr_sect ns;
-    struct natstr *np;
     struct sctstr sect;
     int i;
     /* Note this is not re-entrant anyway, so we keep the buffers
@@ -305,7 +304,6 @@ nav_map(int x, int y, int show_designations)
 	return RET_FAIL;
     }
     snxtsct_dist(&ns, x, y, 1);
-    np = getnatp(player->cnum);
     blankfill(wmapbuf, &ns.range, 1);
     while (nxtsct(&ns, &sect)) {
 	ptr = &wmap[ns.dy][ns.dx];
diff --git a/src/lib/commands/tele.c b/src/lib/commands/tele.c
index 25a663b5a..a6e565dde 100644
--- a/src/lib/commands/tele.c
+++ b/src/lib/commands/tele.c
@@ -46,7 +46,6 @@ tele(void)
     char buf[MAXTELSIZE + 1];	/* UTF-8 */
     int n;
 
-    natp = getnatp(player->cnum);
     if (*player->argp[0] == 'a') {
 	if (getele("everybody", buf) <= 0) {
 	    pr("Announcement aborted\n");