From: Markus Armbruster <armbru@pond.sub.org>
Date: Tue, 19 Feb 2008 19:25:08 +0000 (+0100)
Subject: Define and use NATID_BAD instead of literal 255
X-Git-Tag: v4.3.12~167
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=8d4b959a0ced69777308a35b3a53290bd15828ca

Define and use NATID_BAD instead of literal 255
---

diff --git a/include/nat.h b/include/nat.h
index ae344c5de..c7cb01731 100644
--- a/include/nat.h
+++ b/include/nat.h
@@ -39,6 +39,8 @@
 #include <time.h>
 #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 240093990..bf0ef9378 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 57fe67ba8..9f028fcdb 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 c75a7485c..590d9782a 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;
 }