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

diff --git a/misc.c b/misc.c
index e5f009c..978381d 100644
--- a/misc.c
+++ b/misc.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
+#include <ctype.h>
 
 #include "advent.h"
 #include "database.h"
@@ -10,6 +11,24 @@
 
 /*  I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */
 
+void newspeak(char* msg)
+{
+  // Do nothing if we got a null pointer.
+  if (msg == NULL)
+    return;
+
+  // Do nothing if we got an empty string.
+  if (strlen(msg) == 0)
+    return;
+
+  // Print a newline if the global game.blklin says to.
+  if (game.blklin == true)
+    printf("\n");
+
+  // Print the message.
+  printf("%s\n", msg);
+}
+
 void SPEAK(vocab_t msg)
 /*  Print the message which starts at LINES[N].  Precede it with a blank line
  *  unless game.blklin is false. */
@@ -33,7 +52,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;
 	    }
@@ -43,64 +62,44 @@ void SPEAK(vocab_t msg)
 	     *  If PARAM=1, else 'S' (optional plural ending), 33 (W) = word
 	     *  (two 30-bit values) with trailing spaces suppressed, 22 (L) or
 	     *  31 (U) = word but map to lower/upper case, 13 (C) = word in
-	     *  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])
+	     *  lower case with first letter capitalised, 65-73 (1-9) =
+	     *  number using that many characters. */
+	    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;
+		INLINE[LNPOSN] = ascii_to_advent['s'];
 		if (PARMS[nparms] == 1)
 		    SHFTXT(LNPOSN+1,-1);
 		++nparms;
 		continue;
 	    }
-	    if (prmtyp == ascii_to_advent['T' + 1]) {
-		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 == ascii_to_advent['B' + 1]) {
-		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 == 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])
-		    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 < ascii_to_advent['!' + 1] || prmtyp > ascii_to_advent['-' + 1]) {
+	    if (prmtyp < ascii_to_advent['!'] || prmtyp > ascii_to_advent['-']) {
 		++LNPOSN;
 		continue;
 	    }
@@ -257,21 +256,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 +327,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 +665,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 +688,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);