X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=410dfd88542fbf700894d866ae520c0740b60ab2;hb=00514b079380c064b91f7ab95fec7e793a365d46;hp=2b9159b3d78efdbd38da4b5616b78458b5efe633;hpb=b3057f038bc990e216c1763f7de1f485892296d2;p=open-adventure.git

diff --git a/misc.c b/misc.c
index 2b9159b..410dfd8 100644
--- a/misc.c
+++ b/misc.c
@@ -42,7 +42,7 @@ void packed_to_token(long packed, char token[6])
 
 /*  I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */
 
-void newspeak(const char* msg)
+void speak(const char* msg)
 {
     // Do nothing if we got a null pointer.
     if (msg == NULL)
@@ -126,15 +126,15 @@ void PSPEAK(vocab_t msg, int skip)
  *  is game.prop=N message). */
 {
     if (skip >= 0)
-        newspeak(object_descriptions[msg].longs[skip]);
+        speak(object_descriptions[msg].longs[skip]);
     else
-        newspeak(object_descriptions[msg].inventory);
+        speak(object_descriptions[msg].inventory);
 }
 
 void RSPEAK(vocab_t i)
 /* Print the i-th "random" message (section 6 of database). */
 {
-    newspeak(arbitrary_messages[i]);
+    speak(arbitrary_messages[i]);
 }
 
 void SETPRM(long first, long p1, long p2)
@@ -162,7 +162,7 @@ bool GETIN(FILE *input,
 
     for (;;) {
         if (game.blklin)
-            TYPE0();
+            fputc('\n', stdout);;
         if (!MAPLIN(input))
             return false;
         *pword1 = GETTXT(true, true, true);
@@ -206,7 +206,7 @@ long YES(FILE *input, vocab_t x, vocab_t y, vocab_t z)
     }
 }
 
-/*  Line-parsing routines (GETTXT, MAKEWD, PUTTXT, SHFTXT, TYPE0) */
+/*  Line-parsing routines (GETTXT, MAKEWD, PUTTXT, SHFTXT) */
 
 long GETTXT(bool skip, bool onewrd, bool upper)
 /*  Take characters from an input line and pack them into 30-bit words.
@@ -278,19 +278,6 @@ token_t MAKEWD(long letters)
     return word;
 }
 
-void TYPE0(void)
-/*  Type a blank line.  This procedure is provided as a convenience for callers
- *  who otherwise have no use for MAPCOM. */
-{
-    long temp;
-
-    temp = LNLENG;
-    LNLENG = 0;
-    TYPE();
-    LNLENG = temp;
-    return;
-}
-
 /*  Data structure  routines */
 
 long VOCAB(long id, long init)
@@ -514,7 +501,7 @@ void BUG(long num)
     exit(0);
 }
 
-/*  Machine dependent routines (MAPLIN, TYPE, SAVEIO) */
+/*  Machine dependent routines (MAPLIN, SAVEIO) */
 
 bool MAPLIN(FILE *fp)
 {
@@ -585,8 +572,7 @@ bool MAPLIN(FILE *fp)
          *    63   = percent (%) [ASCII 45 octal, 37 decimal]
          *   64-73 = digits, 0 through 9
          *  Remaining characters can be translated any way that is convenient;
-         *  The "TYPE" routine below is used to map them back to characters when
-         *  necessary.  The above mappings are required so that certain special
+         *  The above mappings are required so that certain special
          *  characters are known to fit in 6 bits and/or can be easily spotted.
          *  Array elements beyond the end of the line should be filled with 0,
          *  and LNLENG should be set to the index of the last character.
@@ -610,26 +596,6 @@ bool MAPLIN(FILE *fp)
     }
 }
 
-void TYPE(void)
-/*  Type the first "LNLENG" characters stored in inline, mapping them
- *  from integers to text per the rules described above.  INLINE
- *  may be changed by this routine. */
-{
-    long i;
-
-    if (LNLENG == 0) {
-        printf("\n");
-        return;
-    }
-
-    for (i = 1; i <= LNLENG; i++) {
-        INLINE[i] = advent_to_ascii[(int) INLINE[i]];
-    }
-    INLINE[LNLENG + 1] = 0;
-    printf("%s\n", INLINE + 1);
-    return;
-}
-
 void DATIME(long* d, long* t)
 {
     struct timeval tv;