Retrofit main.c for the new database and newspeak().

[open-adventure.git] / misc.c

diff --git a/misc.c b/misc.c
index fbfee4fca954c6b05062a7152665533beaedae92..6e51c14179f6584cf561a071653b178308391bef 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -8,9 +8,28 @@
 #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. */
@@ -44,9 +63,8 @@ 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']) {
@@ -57,32 +75,6 @@ void SPEAK(vocab_t msg)
                ++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;
@@ -146,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)