From a4da53086b676b0c8416ae338abc030fac3b8022 Mon Sep 17 00:00:00 2001 From: "Jason S. Ninneman" Date: Sat, 10 Jun 2017 15:34:21 -0700 Subject: [PATCH] Zero-index the lookup tables and the code that references them. --- common.c | 52 ++++++++++++++++++++++++++-------------------------- common.h | 4 ++-- dungeon.c | 2 +- misc.c | 36 ++++++++++++++++++------------------ 4 files changed, 47 insertions(+), 47 deletions(-) diff --git a/common.c b/common.c index c0f5a8b..61394ec 100644 --- a/common.c +++ b/common.c @@ -1,34 +1,34 @@ #include "common.h" const char advent_to_ascii[] = { - '\x00', ' ', '!', '\"', '\'', '(', ')', '*', '+', ',', - '-', '.', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', - 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', - 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', - 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', - 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', - 'w', 'x', 'y', 'z', '%', '0', '1', '2', '3', '4', - '5', '6', '7', '8', '9', '\x00', '\x01', '\x02', '\x03', '\x04', - '\x05', '\x06', '\x07', '\x08', '\x00', '\x00', '\x0b', '\x0c', '\r', '\x0e', - '\x0f', '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17', '\x18', - '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f', '#', '$', '&', - '/', ':', ';', '<', '=', '>', '?', '@', '[', '\\', - ']', '^', '_', '`', '{', '|', '}', '~', '\x00', + ' ', '!', '\"', '\'', '(', ')', '*', '+', ',', '-', + '.', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', + 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', + 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', + 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', + 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', + 'x', 'y', 'z', '%', '0', '1', '2', '3', '4', '5', + '6', '7', '8', '9', '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', + '\x06', '\x07', '\x08', '\x00', '\x00', '\x0b', '\x0c', '\r', '\x0e', '\x0f', + '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17', '\x18', '\x19', + '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f', '#', '$', '&', '/', + ':', ';', '<', '=', '>', '?', '@', '[', '\\', ']', + '^', '_', '`', '{', '|', '}', '~', '\x00', }; /* Rendered from the now-gone MPINIT() function */ const char ascii_to_advent[] = { - 0, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 0, 0, 85, 86, 87, 88, 89, 90, 91, 92, - 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, - 103, 104, 105, 0, 1, 2, 106, 107, 63, 108, - 3, 4, 5, 6, 7, 8, 9, 10, 109, 64, - 65, 66, 67, 68, 69, 70, 71, 72, 73, 110, - 111, 112, 113, 114, 115, 116, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 117, 118, 119, 120, 121, 122, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 59, 60, 61, 62, 123, 124, 125, 126, 83, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 0, + 0, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, + 104, 105, 0, 1, 2, 106, 107, 63, 108, 3, + 4, 5, 6, 7, 8, 9, 10, 109, 64, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 110, 111, + 112, 113, 114, 115, 116, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + 36, 117, 118, 119, 120, 121, 122, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, + 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, + 60, 61, 62, 123, 124, 125, 126, 83, }; diff --git a/common.h b/common.h index 4daed0e..0fadd5e 100644 --- a/common.h +++ b/common.h @@ -4,5 +4,5 @@ #define NOBJECTS 100 #define HNTSIZ 20 -extern const char advent_to_ascii[129]; -extern const char ascii_to_advent[129]; +extern const char advent_to_ascii[128]; +extern const char ascii_to_advent[128]; diff --git a/dungeon.c b/dungeon.c index 0c7ca63..19b55c1 100644 --- a/dungeon.c +++ b/dungeon.c @@ -200,7 +200,7 @@ void MAPLIN(FILE *OPENED) { LNLENG = 0; for (size_t i = 1; i <= sizeof(INLINE) && INLINE[i] != 0; ++i) { - char val = INLINE[i] + 1; + char val = INLINE[i]; INLINE[i] = ascii_to_advent[(unsigned)val]; if (INLINE[i] != 0) LNLENG = i; diff --git a/misc.c b/misc.c index e5f009c..91f2dfa 100644 --- a/misc.c +++ b/misc.c @@ -33,7 +33,7 @@ void SPEAK(vocab_t msg) ++LNPOSN; while (LNPOSN <= LNLENG) { - if (INLINE[LNPOSN] != ascii_to_advent['%' + 1]) { + if (INLINE[LNPOSN] != ascii_to_advent['%']) { ++LNPOSN; continue; } @@ -46,9 +46,9 @@ 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 == ascii_to_advent['!' + 1]) + if (prmtyp == ascii_to_advent['!']) return; - if (prmtyp == ascii_to_advent['S' + 1]) { + if (prmtyp == ascii_to_advent['S']) { SHFTXT(LNPOSN+2,-1); INLINE[LNPOSN] = 55; if (PARMS[nparms] == 1) @@ -56,7 +56,7 @@ void SPEAK(vocab_t msg) ++nparms; continue; } - if (prmtyp == ascii_to_advent['T' + 1]) { + if (prmtyp == ascii_to_advent['T']) { SHFTXT(LNPOSN+2,-2); state=0; casemake=2; @@ -70,7 +70,7 @@ void SPEAK(vocab_t msg) ++nparms; continue; } - if (prmtyp == ascii_to_advent['B' + 1]) { + if (prmtyp == ascii_to_advent['B']) { prmtyp=PARMS[nparms]; SHFTXT(LNPOSN+2,prmtyp-2); if (prmtyp != 0) { @@ -82,25 +82,25 @@ void SPEAK(vocab_t msg) ++nparms; continue; } - if (prmtyp == ascii_to_advent['W' + 1] || prmtyp == ascii_to_advent['L' + 1] || prmtyp == ascii_to_advent['U' + 1] || prmtyp == ascii_to_advent['C' + 1]) { + 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 == ascii_to_advent['U' + 1]) + if (prmtyp == ascii_to_advent['U']) casemake=1; - if (prmtyp == ascii_to_advent['W' + 1]) + if (prmtyp == ascii_to_advent['W']) casemake=0; i = LNPOSN; PUTTXT(PARMS[nparms],&state,casemake); PUTTXT(PARMS[nparms+1],&state,casemake); - if (prmtyp == ascii_to_advent['C' + 1] && INLINE[i] >= ascii_to_advent['a' + 1] && INLINE[i] <= ascii_to_advent['z' + 1]) + if (prmtyp == ascii_to_advent['C'] && INLINE[i] >= ascii_to_advent['a'] && INLINE[i] <= ascii_to_advent['z']) INLINE[i] -= 26; nparms += 2; continue; } prmtyp=prmtyp-64; - if (prmtyp < ascii_to_advent['!' + 1] || prmtyp > ascii_to_advent['-' + 1]) { + if (prmtyp < ascii_to_advent['!'] || prmtyp > ascii_to_advent['-']) { ++LNPOSN; continue; } @@ -257,21 +257,21 @@ long GETTXT(bool skip, bool onewrd, bool upper) if (LNPOSN > LNLENG || (onewrd && INLINE[LNPOSN] == 0)) continue; char current=INLINE[LNPOSN]; - if (current < ascii_to_advent['%' + 1]) { + if (current < ascii_to_advent['%']) { splitting = -1; - if (upper && current >= ascii_to_advent['a' + 1]) + if (upper && current >= ascii_to_advent['a']) current=current-26; text=text+current; ++LNPOSN; continue; } if (splitting != LNPOSN) { - text=text+ascii_to_advent['%' + 1]; + text=text+ascii_to_advent['%']; splitting = LNPOSN; continue; } - text=text+current-ascii_to_advent['%' + 1]; + text=text+current-ascii_to_advent['%']; splitting = -1; ++LNPOSN; } @@ -328,8 +328,8 @@ void PUTTXT(token_t word, long *state, long casemake) return; byte=w/div; w=(w-byte*div)*64; - if (!(*state != 0 || byte != ascii_to_advent['%' + 1])) { - *state=ascii_to_advent['%' + 1]; + if (!(*state != 0 || byte != ascii_to_advent['%'])) { + *state=ascii_to_advent['%']; continue; } SHFTXT(LNPOSN,1); @@ -666,7 +666,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; @@ -689,7 +689,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); -- 2.31.1