Remove handlers for disused advent format specifiers.

[open-adventure.git] / misc.c

diff --git a/misc.c b/misc.c
index 6fe53ce6335be67207f7150fb3f2e0f01aa1fe17..ba9bed32991e7975275eeb064895714bea22b69c 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -3,13 +3,12 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
+#include <ctype.h>
 
 #include "advent.h"
 #include "database.h"
 #include "linenoise/linenoise.h"
 
-#define PERCENT        63      /* partly hide the packed encoding */
-
 /*  I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */
 
 void SPEAK(vocab_t msg)
@@ -35,7 +34,7 @@ void SPEAK(vocab_t msg)
        ++LNPOSN;
 
        while (LNPOSN <= LNLENG) { 
-           if (INLINE[LNPOSN] != PERCENT) {
+           if (INLINE[LNPOSN] != ascii_to_advent['%']) {
                ++LNPOSN;
                continue;
            }
@@ -48,61 +47,42 @@ void SPEAK(vocab_t msg)
             *  lower case with first letter capitalised, 30 (T) = text ending
             *  with a word of -1, 65-73 (1-9) = number using that many
             *  characters, 12 (B) = variable number of blanks. */
-           if (prmtyp == 1)
+           if (prmtyp == ascii_to_advent['!'])
                return;
-           if (prmtyp == 29) {
+           if (prmtyp == ascii_to_advent['S']) {
                SHFTXT(LNPOSN+2,-1);
-               INLINE[LNPOSN] = 55;
+               INLINE[LNPOSN] = ascii_to_advent['s'];
                if (PARMS[nparms] == 1)
                    SHFTXT(LNPOSN+1,-1);
                ++nparms;
                continue;
            }
-           if (prmtyp == 30) {
-               SHFTXT(LNPOSN+2,-2);
-               state=0;
-               casemake=2;
-
-               while (PARMS[nparms] > 0) {
-                   if (PARMS[nparms+1] < 0)
-                       casemake=0;
-                   PUTTXT(PARMS[nparms],&state,casemake);
-                   ++nparms;
-               }
-               ++nparms;
-               continue;
-           }
-           if (prmtyp == 12) {
-               prmtyp=PARMS[nparms];
-               SHFTXT(LNPOSN+2,prmtyp-2);
-               if (prmtyp != 0) {
-                   for (i=1; i<=prmtyp; i++) {
-                       INLINE[LNPOSN]=0;
-                       ++LNPOSN;
-                   }
-               }
-               ++nparms;
-               continue;
-           }
-           if (prmtyp == 33 || prmtyp == 22 || prmtyp == 31 || prmtyp == 13) {
+           if (prmtyp == ascii_to_advent['W'] || prmtyp == ascii_to_advent['L'] || prmtyp == ascii_to_advent['U'] || prmtyp == ascii_to_advent['C']) {
                SHFTXT(LNPOSN+2,-2);
                state = 0;
                casemake = -1;
-               if (prmtyp == 31)
+               if (prmtyp == ascii_to_advent['U'])
                    casemake=1;
-               if (prmtyp == 33)
+               if (prmtyp == ascii_to_advent['W'])
                    casemake=0;
                i = LNPOSN;
                PUTTXT(PARMS[nparms],&state,casemake);
                PUTTXT(PARMS[nparms+1],&state,casemake);
-               if (prmtyp == 13 && INLINE[i] >= 37 && INLINE[i] <= 62)
-                   INLINE[i] -= 26;
+               if (prmtyp == ascii_to_advent['C'] && INLINE[i] >= ascii_to_advent['a'] && INLINE[i] <= ascii_to_advent['z'])
+                 {
+                   // Convert to uppercase.
+                   // Round-trip to ASCII and back so that this code doesn't break when the mapping changes.
+                   // This can be simplified when mapping goes away.
+                   char this = advent_to_ascii[INLINE[i]];
+                   char uc_this = toupper(this);
+                   INLINE[i] = ascii_to_advent[uc_this];
+                 }
                nparms += 2;
                continue;
            }
 
            prmtyp=prmtyp-64;
-           if (prmtyp < 1 || prmtyp > 9) {
+           if (prmtyp < ascii_to_advent['!'] || prmtyp > ascii_to_advent['-']) {
                ++LNPOSN;
                continue;
            }
@@ -259,21 +239,21 @@ long GETTXT(bool skip, bool onewrd, bool upper)
        if (LNPOSN > LNLENG || (onewrd && INLINE[LNPOSN] == 0))
            continue;
        char current=INLINE[LNPOSN];
-       if (current < PERCENT) {
+       if (current < ascii_to_advent['%']) {
            splitting = -1;
-           if (upper && current >= 37)
+           if (upper && current >= ascii_to_advent['a'])
                current=current-26;
            text=text+current;
            ++LNPOSN;
            continue;
        }
        if (splitting != LNPOSN) {
-           text=text+PERCENT;
+           text=text+ascii_to_advent['%'];
            splitting = LNPOSN;
            continue;
        }
 
-       text=text+current-PERCENT;
+       text=text+current-ascii_to_advent['%'];
        splitting = -1;
        ++LNPOSN;
     }
@@ -330,8 +310,8 @@ void PUTTXT(token_t word, long *state, long casemake)
            return;
        byte=w/div;
        w=(w-byte*div)*64;
-       if (!(*state != 0 || byte != PERCENT)) {
-           *state=PERCENT;
+       if (!(*state != 0 || byte != ascii_to_advent['%'])) {
+           *state=ascii_to_advent['%'];
            continue;
        }
        SHFTXT(LNPOSN,1);
@@ -668,7 +648,7 @@ bool MAPLIN(FILE *fp)
        strcpy(INLINE+1, rawbuf);
        LNLENG=0;
        for (i=1; i<=(long)sizeof(INLINE) && INLINE[i]!=0; i++) {
-           val=INLINE[i]+1;
+           val=INLINE[i];
            INLINE[i]=ascii_to_advent[val];
            if (INLINE[i] != 0)
                LNLENG=i;
@@ -691,7 +671,7 @@ void TYPE(void)
     }
 
     for (i=1; i<=LNLENG; i++) {
-       INLINE[i]=advent_to_ascii[INLINE[i]+1];
+       INLINE[i]=advent_to_ascii[INLINE[i]];
     }
     INLINE[LNLENG+1]=0;
     printf("%s\n", INLINE+1);