#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 */
-
-const char advent_to_ascii[] = {0, 32, 33, 34, 39, 40, 41, 42, 43, 44, 45, 46, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 37, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 0, 1, 2, 3, 4, 5, 6, 7, 8, 0, 0, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 35, 36, 38, 47, 58, 59, 60, 61, 62, 63, 64, 91, 92, 93, 94, 95, 96, 123, 124, 125, 126, 0};
-/* 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};
-
/* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */
void SPEAK(vocab_t msg)
nparms=1;
do {
nxt=labs(LINES[msg])-1;
- msg=msg+1;
+ ++msg;
LNLENG=0;
LNPOSN=1;
state=0;
++LNPOSN;
while (LNPOSN <= LNLENG) {
- if (INLINE[LNPOSN] != PERCENT) {
+ if (INLINE[LNPOSN] != ascii_to_advent['%']) {
++LNPOSN;
continue;
}
* 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) {
+ if (prmtyp == ascii_to_advent['T']) {
SHFTXT(LNPOSN+2,-2);
state=0;
casemake=2;
if (PARMS[nparms+1] < 0)
casemake=0;
PUTTXT(PARMS[nparms],&state,casemake);
- nparms=nparms+1;
+ ++nparms;
}
++nparms;
continue;
}
- if (prmtyp == 12) {
+ if (prmtyp == ascii_to_advent['B']) {
prmtyp=PARMS[nparms];
SHFTXT(LNPOSN+2,prmtyp-2);
if (prmtyp != 0) {
++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;
}
return(text);
if ((!skip) || INLINE[LNPOSN] != 0)
break;
- LNPOSN=LNPOSN+1;
+ ++LNPOSN;
}
text=0;
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=LNPOSN+1;
+ ++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=LNPOSN+1;
+ ++LNPOSN;
}
return text;
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);
*state=*state+byte;
if (*state < alph2 && *state >= alph1)*state=*state-26*casemake;
INLINE[LNPOSN]=*state;
- LNPOSN=LNPOSN+1;
+ ++LNPOSN;
*state=0;
}
}
if (game.place[object] == -1)
return;
game.place[object]= -1;
- game.holdng=game.holdng+1;
+ ++game.holdng;
}
if (game.atloc[where] == object) {
game.atloc[where]=game.link[object];
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;
}
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);