X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=e5f009c8efba90368a9e6e15e2a0b2c573deda6c;hb=e7906b4ca339d14b56b03b166e9bc3d57598963b;hp=546cf48cfb9d9aacd2d28586e77dc2102891efce;hpb=3af993abcacd18f114e8dd54f9d3be6a3a62ea2e;p=open-adventure.git

diff --git a/misc.c b/misc.c
index 546cf48..e5f009c 100644
--- a/misc.c
+++ b/misc.c
@@ -8,12 +8,6 @@
 #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)
@@ -28,7 +22,7 @@ void SPEAK(vocab_t msg)
     nparms=1;
     do {
 	nxt=labs(LINES[msg])-1;
-	msg=msg+1;
+	++msg;
 	LNLENG=0;
 	LNPOSN=1;
 	state=0;
@@ -39,7 +33,7 @@ void SPEAK(vocab_t msg)
 	++LNPOSN;
 
 	while (LNPOSN <= LNLENG) { 
-	    if (INLINE[LNPOSN] != PERCENT) {
+	    if (INLINE[LNPOSN] != ascii_to_advent['%' + 1]) {
 		++LNPOSN;
 		continue;
 	    }
@@ -52,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 == 1)
+	    if (prmtyp == ascii_to_advent['!' + 1])
 		return;
-	    if (prmtyp == 29) {
+	    if (prmtyp == ascii_to_advent['S' + 1]) {
 		SHFTXT(LNPOSN+2,-1);
 		INLINE[LNPOSN] = 55;
 		if (PARMS[nparms] == 1)
@@ -62,7 +56,7 @@ void SPEAK(vocab_t msg)
 		++nparms;
 		continue;
 	    }
-	    if (prmtyp == 30) {
+	    if (prmtyp == ascii_to_advent['T' + 1]) {
 		SHFTXT(LNPOSN+2,-2);
 		state=0;
 		casemake=2;
@@ -71,12 +65,12 @@ void SPEAK(vocab_t msg)
 		    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' + 1]) {
 		prmtyp=PARMS[nparms];
 		SHFTXT(LNPOSN+2,prmtyp-2);
 		if (prmtyp != 0) {
@@ -88,25 +82,25 @@ void SPEAK(vocab_t msg)
 		++nparms;
 		continue;
 	    }
-	    if (prmtyp == 33 || prmtyp == 22 || prmtyp == 31 || prmtyp == 13) {
+	    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]) {
 		SHFTXT(LNPOSN+2,-2);
 		state = 0;
 		casemake = -1;
-		if (prmtyp == 31)
+		if (prmtyp == ascii_to_advent['U' + 1])
 		    casemake=1;
-		if (prmtyp == 33)
+		if (prmtyp == ascii_to_advent['W' + 1])
 		    casemake=0;
 		i = LNPOSN;
 		PUTTXT(PARMS[nparms],&state,casemake);
 		PUTTXT(PARMS[nparms+1],&state,casemake);
-		if (prmtyp == 13 && INLINE[i] >= 37 && INLINE[i] <= 62)
+		if (prmtyp == ascii_to_advent['C' + 1] && INLINE[i] >= ascii_to_advent['a' + 1] && INLINE[i] <= ascii_to_advent['z' + 1])
 		    INLINE[i] -= 26;
 		nparms += 2;
 		continue;
 	    }
 
 	    prmtyp=prmtyp-64;
-	    if (prmtyp < 1 || prmtyp > 9) {
+	    if (prmtyp < ascii_to_advent['!' + 1] || prmtyp > ascii_to_advent['-' + 1]) {
 		++LNPOSN;
 		continue;
 	    }
@@ -254,7 +248,7 @@ long GETTXT(bool skip, bool onewrd, bool upper)
 	    return(text);
 	if ((!skip) || INLINE[LNPOSN] != 0)
 	    break;
-	LNPOSN=LNPOSN+1;
+	++LNPOSN;
     }
 
     text=0;
@@ -263,23 +257,23 @@ 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['%' + 1]) {
 	    splitting = -1;
-	    if (upper && current >= 37)
+	    if (upper && current >= ascii_to_advent['a' + 1])
 		current=current-26;
 	    text=text+current;
-	    LNPOSN=LNPOSN+1;
+	    ++LNPOSN;
 	    continue;
 	}
 	if (splitting != LNPOSN) {
-	    text=text+PERCENT;
+	    text=text+ascii_to_advent['%' + 1];
 	    splitting = LNPOSN;
 	    continue;
 	}
 
-	text=text+current-PERCENT;
+	text=text+current-ascii_to_advent['%' + 1];
 	splitting = -1;
-	LNPOSN=LNPOSN+1;
+	++LNPOSN;
     }
 
     return text;
@@ -334,15 +328,15 @@ 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['%' + 1])) {
+	    *state=ascii_to_advent['%' + 1];
 	    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;
     }
 }
@@ -464,7 +458,7 @@ void CARRY(long object, long where)
 	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];