Rename newspeak() to speak().
This commit is contained in:
parent
704b86afbb
commit
672ef17d4c
4 changed files with 8 additions and 8 deletions
2
advent.h
2
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);
|
||||
|
|
4
main.c
4
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;
|
||||
|
|
8
misc.c
8
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)
|
||||
|
|
2
score.c
2
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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue