From c7ca4ee73c77c2f2d94af360fc73ac7e060911ea Mon Sep 17 00:00:00 2001 From: "Jason S. Ninneman" Date: Sun, 11 Jun 2017 11:44:25 -0700 Subject: [PATCH] Retrofit RSPEAK() and PSPEAK(). --- misc.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) 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) -- 2.31.1