archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up missed actspk[] references.

Browse source
This commit is contained in:
Jason S. Ninneman 2017-06-26 22:03:42 -07:00
parent a76cbeccbb
commit 004fe76917
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
actions.c
View file

@ -816,7 +816,7 @@ static int read(struct command_t command)
} else if (command.obj == OYSTER && !game.clshnt && game.closed) { } else if (command.obj == OYSTER && !game.clshnt && game.closed) {
game.clshnt = yes(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]); game.clshnt = yes(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]);
} else if (objects[command.obj].texts[0] == NULL || game.prop[command.obj] < 0) { } else if (objects[command.obj].texts[0] == NULL || game.prop[command.obj] < 0) {
rspeak(actspk[command.verb]); rspeak(actions[command.verb].message);
} else } else
pspeak(command.obj, study, game.prop[command.obj]); pspeak(command.obj, study, game.prop[command.obj]);
return GO_CLEAROBJ; return GO_CLEAROBJ;
@ -893,7 +893,7 @@ static int throw (FILE *cmdin, struct command_t *command)
* (Only way to do so!) Axe also special for dragon, bear, and * (Only way to do so!) Axe also special for dragon, bear, and
* troll. Treasures special for troll. */ * troll. Treasures special for troll. */
{ {
int spk = actspk[command->verb]; int spk = actions[command->verb].message;
if (TOTING(ROD2) && command->obj == ROD && !TOTING(ROD))command->obj = ROD2; if (TOTING(ROD2) && command->obj == ROD && !TOTING(ROD))command->obj = ROD2;
if (!TOTING(command->obj)) { if (!TOTING(command->obj)) {
rspeak(spk); rspeak(spk);
@ -1005,7 +1005,7 @@ int action(FILE *input, struct command_t *command)
* unless verb is "say", which snarfs arbitrary second word. * unless verb is "say", which snarfs arbitrary second word.
*/ */
{ {
token_t spk = actspk[command->verb]; token_t spk = actions[command->verb].message;
if (command->part == unknown) { if (command->part == unknown) {
/* Analyse an object word. See if the thing is here, whether /* Analyse an object word. See if the thing is here, whether