Narrow natpass() parameter cn's type to natid

diff --git a/include/prototypes.h b/include/prototypes.h
index ee9d524c38bf4e61bb1bb41e7127239b14f3e6fa..a531e19c890964f7711738dac4cdadc5eaa3922c 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -377,7 +377,7 @@ extern int player_set_nstat(struct player *, struct natstr *);
 extern void player_login(void *);
 /* nat.c */
 extern int natbyname(char *, natid *);
-extern int natpass(int, char *);
+extern int natpass(natid, char *);
 /* player.c */
 extern struct player *player;  /* current player's context */
 extern char *praddr(struct player *);

diff --git a/src/lib/player/nat.c b/src/lib/player/nat.c
index fb03026961cf48964f2445ad67a4c95ca7c85ac2..cfbb50c458fe18c3af17d831d72c92396bd0434f 100644 (file)
--- a/src/lib/player/nat.c
+++ b/src/lib/player/nat.c
@@ -54,11 +54,11 @@ natbyname(char *name, natid *result)
 }
 
 int
-natpass(int cn, char *pass)
+natpass(natid cn, char *pass)
 {
     struct natstr *np;
 
-    np = getnatp((natid)cn);
+    np = getnatp(cn);
     if (np->nat_stat == STAT_VIS)
        return 1;
     if (strcmp(np->nat_pnam, pass) == 0)