From: Jason S. Ninneman <jsn@mbar.us>
Date: Sun, 18 Jun 2017 17:06:14 +0000 (-0700)
Subject: Rename newspeak() to speak().
X-Git-Tag: 1.1~253
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F100%2Fhead;p=open-adventure.git

Rename newspeak() to speak().
---

diff --git a/advent.h b/advent.h
index 043dd6b..ce5e7c5 100644
--- a/advent.h
+++ b/advent.h
@@ -85,7 +85,7 @@ extern bool oldstyle, editline, prompt;
 #define WRITE_MODE "wb"
 extern char* xstrdup(const char*);
 extern void packed_to_token(long, char token[]);
-extern void newspeak(const char*);
+extern void speak(const char*);
 extern void PSPEAK(vocab_t,int);
 extern void RSPEAK(vocab_t);
 extern void SETPRM(long,long,long);
diff --git a/main.c b/main.c
index 6eb783a..21fedad 100644
--- a/main.c
+++ b/main.c
@@ -956,7 +956,7 @@ static bool do_command(FILE *cmdin)
             msg = arbitrary_messages[PITCH_DARK];
         }
         if (TOTING(BEAR))RSPEAK(TAME_BEAR);
-        newspeak(msg);
+        speak(msg);
         if (FORCED(game.loc)) {
             if (playermove(cmdin, verb, 1))
                 return true;
@@ -1003,7 +1003,7 @@ L2607:
         game.foobar = (game.foobar > 0 ? -game.foobar : 0);
         ++game.turns;
         if (game.turns == game.thresh) {
-            newspeak(turn_threshold_messages[game.trndex]);
+            speak(turn_threshold_messages[game.trndex]);
             game.trnluz = game.trnluz + TRNVAL[game.trndex] / 100000;
             ++game.trndex;
             game.thresh = -1;
diff --git a/misc.c b/misc.c
index 2b9159b..3eda32a 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)
diff --git a/score.c b/score.c
index abe3337..b80104d 100644
--- a/score.c
+++ b/score.c
@@ -121,7 +121,7 @@ void terminate(enum termination mode)
     RSPEAK(TOTAL_SCORE);
     for (long i = 1; i <= (long)CLSSES; i++) {
         if (CVAL[i] >= points) {
-            newspeak(class_messages[i]);
+            speak(class_messages[i]);
             i = CVAL[i] + 1 - points;
             SETPRM(1, i, i);
             RSPEAK(NEXT_HIGHER);