From: Jason S. Ninneman <jsn@mbar.us>
Date: Sun, 11 Jun 2017 18:44:25 +0000 (-0700)
Subject: Retrofit RSPEAK() and PSPEAK().
X-Git-Tag: 1.1~417
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=c7ca4ee73c77c2f2d94af360fc73ac7e060911ea;p=open-adventure.git

Retrofit RSPEAK() and PSPEAK().
---

diff --git a/misc.c b/misc.c
index 978381d..6e51c14 100644
--- a/misc.c
+++ b/misc.c
@@ -8,6 +8,7 @@
 #include "advent.h"
 #include "database.h"
 #include "linenoise/linenoise.h"
+#include "newdb.h"
 
 /*  I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */
 
@@ -137,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)