From 8d4b959a0ced69777308a35b3a53290bd15828ca Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 19 Feb 2008 20:25:08 +0100 Subject: [PATCH] Define and use NATID_BAD instead of literal 255 --- include/nat.h | 2 ++ src/lib/player/accept.c | 3 ++- src/lib/player/login.c | 4 ++-- src/lib/player/nat.c | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/nat.h b/include/nat.h index ae344c5d..c7cb0173 100644 --- a/include/nat.h +++ b/include/nat.h @@ -39,6 +39,8 @@ #include #include "types.h" +#define NATID_BAD 255 + #define MAXNOR 50 /* max # realms */ /* Nation status */ diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c index 24009399..bf0ef937 100644 --- a/src/lib/player/accept.c +++ b/src/lib/player/accept.c @@ -47,6 +47,7 @@ #include "empthread.h" #include "file.h" #include "misc.h" +#include "nat.h" #include "optlist.h" #include "player.h" #include "power.h" @@ -84,7 +85,7 @@ player_new(int s) return NULL; } emp_insque(&lp->queue, &Players); - lp->cnum = 255; + lp->cnum = NATID_BAD; lp->curid = -1; time(&lp->curup); } diff --git a/src/lib/player/login.c b/src/lib/player/login.c index 57fe67ba..9f028fcd 100644 --- a/src/lib/player/login.c +++ b/src/lib/player/login.c @@ -207,7 +207,7 @@ pass_cmd(void) { if (!player->argp[1]) return RET_SYN; - if (player->cnum == 255) { + if (player->cnum == NATID_BAD) { pr_id(player, C_CMDERR, "need country first\n"); return RET_FAIL; } @@ -280,7 +280,7 @@ may_play(void) { struct natstr *np; - if (player->cnum == 255 || !player->authenticated) { + if (player->cnum == NATID_BAD || !player->authenticated) { pr_id(player, C_CMDERR, "need country and password\n"); return 0; } diff --git a/src/lib/player/nat.c b/src/lib/player/nat.c index c75a7485..590d9782 100644 --- a/src/lib/player/nat.c +++ b/src/lib/player/nat.c @@ -49,7 +49,7 @@ natbyname(char *name, natid *result) return 0; } } - *result = 255; + *result = NATID_BAD; return -1; }