Define and use NATID_BAD instead of literal 255

diff --git a/include/nat.h b/include/nat.h
index ae344c5de7225e30bba94bd77a452c2cec5a5e82..c7cb0173175428dfcd75bbe3841d0fc5d994c4b0 100644 (file)
--- a/include/nat.h
+++ b/include/nat.h
@@ -39,6 +39,8 @@
 #include <time.h>
 #include "types.h"
 
 #include <time.h>
 #include "types.h"
 

+#define NATID_BAD 255
+

 #define        MAXNOR          50      /* max # realms */
 
 /* Nation status */
 #define        MAXNOR          50      /* max # realms */
 
 /* Nation status */

diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c
index 240093990cb2939b2f3c13543aa7c978b8e50420..bf0ef937873c9fddcaf12b9a6d445fd07fe6ce10 100644 (file)
--- 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 "empthread.h"
 #include "file.h"
 #include "misc.h"

+#include "nat.h"

 #include "optlist.h"
 #include "player.h"
 #include "power.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);
            return NULL;
        }
        emp_insque(&lp->queue, &Players);

-       lp->cnum = 255;
+       lp->cnum = NATID_BAD;

        lp->curid = -1;
        time(&lp->curup);
     }
        lp->curid = -1;
        time(&lp->curup);
     }

diff --git a/src/lib/player/login.c b/src/lib/player/login.c
index 57fe67ba80b4955768ac6deaed5479d385ee1426..9f028fcdbcc4efad82c217edfdc1e58729d13456 100644 (file)
--- 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->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;
     }
        pr_id(player, C_CMDERR, "need country first\n");
        return RET_FAIL;
     }


@@ -280,7 +280,7 @@ may_play(void)
 {
     struct natstr *np;
 
 {
     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;
     }
        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 c75a7485cb95c3ef95659e76b5f996782db7990b..590d9782afd0a4a2096fcd948ddcb1fe2206d18d 100644 (file)
--- a/src/lib/player/nat.c
+++ b/src/lib/player/nat.c
@@ -49,7 +49,7 @@ natbyname(char *name, natid *result)
            return 0;
        }
     }
            return 0;
        }
     }

-    *result = 255;
+    *result = NATID_BAD;

     return -1;
 }
 
     return -1;
 }