X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=6e51c14179f6584cf561a071653b178308391bef;hb=3178f5d9948e6bf1ad74069b9512e7b256b0ff08;hp=91f2dfa6ad6406a3400c614495da52163410a124;hpb=a4da53086b676b0c8416ae338abc030fac3b8022;p=open-adventure.git

diff --git a/misc.c b/misc.c
index 91f2dfa..6e51c14 100644
--- a/misc.c
+++ b/misc.c
@@ -3,13 +3,33 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
+#include <ctype.h>
 
 #include "advent.h"
 #include "database.h"
 #include "linenoise/linenoise.h"
+#include "newdb.h"
 
 /*  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. */
@@ -43,45 +63,18 @@ 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. */
+	     *  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']) {
 		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']) {
-		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']) {
-		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'] || prmtyp == ascii_to_advent['L'] || prmtyp == ascii_to_advent['U'] || prmtyp == ascii_to_advent['C']) {
 		SHFTXT(LNPOSN+2,-2);
 		state = 0;
@@ -94,7 +87,14 @@ void SPEAK(vocab_t msg)
 		PUTTXT(PARMS[nparms],&state,casemake);
 		PUTTXT(PARMS[nparms+1],&state,casemake);
 		if (prmtyp == ascii_to_advent['C'] && INLINE[i] >= ascii_to_advent['a'] && INLINE[i] <= ascii_to_advent['z'])
-		    INLINE[i] -= 26;
+		  {
+		    // 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;
 	    }
@@ -138,25 +138,16 @@ void PSPEAK(vocab_t msg,int skip)
  *  the index of the inventory message for object.  (INVEN+N+1 message
  *  is game.prop=N message). */
 {
-    long i, m;
-
-    m=PTEXT[msg];
-    if (skip >= 0) {
-	for (i=0; i <=skip; i++) {
-	    do {
-		m=labs(LINES[m]);
-	    } while
-		(LINES[m] >= 0);
-	}
-    }
-    SPEAK(m);
+  if (skip >= 0)
+    newspeak(object_descriptions[msg].longs[skip]);
+  else
+    newspeak(object_descriptions[msg].inventory);
 }
 
 void RSPEAK(vocab_t i)
 /* Print the i-th "random" message (section 6 of database). */
 {
-    if (i != 0)
-	SPEAK(RTEXT[i]);
+  newspeak(arbitrary_messages[i]);
 }
 
 void SETPRM(long first, long p1, long p2)