More more globals into the game state block.

[open-adventure.git] / misc.c

diff --git a/misc.c b/misc.c
index e6ee7d1dbeee6e726fad14c4046d4194950309d4..5c71c744d7067f4806e5664e2878324c8ce82ff0 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -272,7 +272,7 @@ long GETTXT(bool SKIP,bool ONEWRD, bool UPPER) {
   return(TEXT);
 }
 
-long MAKEWD(long LETTRS) {
+token_t MAKEWD(long LETTRS) {
 long I, L, WORD;
 
 /*  Combine five uppercase letters (represented by pairs of decimal digits
@@ -282,15 +282,13 @@ long I, L, WORD;
  *  kludgey workaround, you can increment a letter by 5 by adding 50 to
  *  the next pair of digits. */
 
-
        WORD=0;
        I=1;
-       L=LETTRS;
-L10:   WORD=WORD+I*(MOD(L,50)+10);
-       I=I*64;
-       if(MOD(L,100) > 50)WORD=WORD+I*5;
-       L=L/100;
-       if(L != 0) goto L10;
+       for (L=LETTRS; L != 0; L=L/100) {
+               WORD=WORD+I*(MOD(L,50)+10);
+               I=I*64;
+               if(MOD(L,100) > 50)WORD=WORD+I*5;
+       }
        I=64L*64L*64L*64L*64L/I;
        WORD=WORD*I;
        return(WORD);
@@ -298,7 +296,7 @@ L10:        WORD=WORD+I*(MOD(L,50)+10);
 
 
 #define STATE (*sTATE)
-void fPUTTXT(long WORD, long *sTATE, long CASE) {
+void fPUTTXT(token_t WORD, long *sTATE, long CASE) {
 long ALPH1, ALPH2, BYTE, DIV, I, W;
 
 /*  Unpack the 30-bit value in word to obtain up to 5 integer-encoded chars,
@@ -594,8 +592,8 @@ long AT, I;
        if(DFLAG < 2)return(AT);
        AT= -1;
        for (I=1; I<=NDWARVES-1; I++) {
-       if(DLOC[I] == WHERE) goto L2;
-       if(DLOC[I] != 0)AT=0;
+       if(game.dloc[I] == WHERE) goto L2;
+       if(game.dloc[I] != 0)AT=0;
        } /* end loop */
        return(AT);